gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix coding style

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-06-03 12:27:02 -04:00
parent a859c2b8ff
commit bd762244ec
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
import.php
View File

@ -373,7 +373,7 @@ if ($import_file != 'none' && ! $error) {
* @todo make use of the config's temp dir with fallback to the
* system's tmp dir
*/
$tmp_subdir = ini_get('upload_tmp_dir');
$tmp_subdir = ini_get('upload_tmp_dir');
if (is_writable($tmp_subdir)) {

2
import_status.php
View File

@ -19,7 +19,7 @@
* and re-import after switching to our session.
*
* However, since https://github.com/phpmyadmin/phpmyadmin/commit/063a2d99
* we have deactivated this feature, so the corresponding code is now
* we have deactivated this feature, so the corresponding code is now
* commented out.
*/

4
libraries/mult_submits.inc.php
View File

@ -263,7 +263,7 @@ if (!empty($submit_mult) && !empty($what)) {
}
} else {
if (isset($submit_mult)
&& ($submit_mult == 'sync_unique_columns_central_list'
&& ($submit_mult == 'sync_unique_columns_central_list'
|| $submit_mult == 'delete_unique_columns_central_list'
|| $submit_mult == 'add_to_central_columns'
|| $submit_mult == 'remove_from_central_columns')
@ -277,4 +277,4 @@ if (!empty($submit_mult) && !empty($what)) {
$message = PMA_Message::success(__('No change'));
}
}
?>
?>

4
libraries/relation.lib.php
View File

@ -422,7 +422,7 @@ function PMA_checkRelationsParam()
$cfgRelation['central_columnswork'] = false;
$cfgRelation['user'] = null;
$cfgRelation['db'] = null;
if ($GLOBALS['server'] == 0
|| empty($GLOBALS['cfg']['Server']['pmadb'])
|| ! $GLOBALS['dbi']->selectDb(
@ -555,7 +555,7 @@ function PMA_checkRelationsParam()
if (isset($cfgRelation['savedsearches'])) {
$cfgRelation['savedsearcheswork'] = true;
}
if (isset($cfgRelation['central_columns'])) {
$cfgRelation['central_columnswork'] = true;
}

10
libraries/structure.lib.php
View File

@ -1476,12 +1476,12 @@ function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir,
if ($GLOBALS['cfgRelation']['central_columnswork']) {
$html_output .= PMA_Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_central_columns_add',
__('Add to central columns'), 'centralColumns_add.png',
__('Add to central columns'), 'centralColumns_add.png',
'add_to_central_columns'
);
$html_output .= PMA_Util::getButtonOrImage(
'submit_mult', 'mult_submit', 'submit_mult_central_columns_remove',
__('Remove from central columns'), 'centralColumns_delete.png',
__('Remove from central columns'), 'centralColumns_delete.png',
'remove_from_central_columns'
);
}
@ -2072,7 +2072,7 @@ function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
if ($GLOBALS['cfgRelation']['central_columnswork']) {
$html_output .= '<li class="browse nowrap">';
if ($isInCentralColumns) {
$html_output .=
$html_output .=
'<a href="#" onclick=$("input:checkbox").removeAttr("checked");'
. '$("#checkbox_row_' . $rownum . '").attr("checked","checked");'
. '$("button[value=remove_from_central_columns]").click();>'
@ -2082,12 +2082,12 @@ function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine,
)
. '</a>';
} else {
$html_output .=
$html_output .=
'<a href="#" onclick=$("input:checkbox").removeAttr("checked");'
. '$("#checkbox_row_' . $rownum . '").attr("checked","checked");'
. '$("button[value=add_to_central_columns]").click();>'
. PMA_Util::getIcon(
'centralColumns_add.png',
'centralColumns_add.png',
__('Add to central columns')
)
. '</a>';

6
libraries/tbl_columns_definition_form.lib.php
View File

@ -1345,7 +1345,7 @@ function PMA_getFormParamsForOldColumn(
$form_params['field_attribute_orig[' . $columnNumber . ']'] = '';
}
// old column null
// old column null
if (isset($columnMeta['Null'])) {
$form_params['field_null_orig[' . $columnNumber . ']']
= $columnMeta['Null'];
@ -1353,7 +1353,7 @@ function PMA_getFormParamsForOldColumn(
$form_params['field_null_orig[' . $columnNumber . ']'] = '';
}
// old column extra (for auto_increment)
// old column extra (for auto_increment)
if (isset($columnMeta['Extra'])) {
$form_params['field_extra_orig[' . $columnNumber . ']']
= $columnMeta['Extra'];
@ -1361,7 +1361,7 @@ function PMA_getFormParamsForOldColumn(
$form_params['field_extra_orig[' . $columnNumber . ']'] = '';
}
// old column comment
// old column comment
if (isset($columnMeta['Comment'])) {
$form_params['field_comments_orig[' . $columnNumber . ']']
= $columnMeta['Comment'];

4
test/libraries/PMA_mult_submits_test.php
View File

@ -383,7 +383,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
__('Yes'),
$mult_btn
);
//validate 5: $centralColsError
$this->assertEquals(
null,
@ -422,7 +422,7 @@ class PMA_MultSubmits_Test extends PHPUnit_Framework_TestCase
__('Yes'),
$mult_btn
);
//validate 5: $centralColsError
$this->assertEquals(
null,