diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-07-09 14:45:10 +0300 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-07-09 14:45:10 +0300 |
commit | b0ae16fcd69ed761c548a4d45c1cec804cb69edb (patch) | |
tree | b4cb9d15451d27d29bca18c2ef64a8307003f79b | |
parent | f0664e7875ad3bc24e82ef716681a1be65926aab (diff) |
These are also internal directives. Remove underscore to match with other similar ones
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
-rw-r--r-- | db_designer.php | 2 | ||||
-rw-r--r-- | libraries/Menu.class.php | 4 | ||||
-rw-r--r-- | libraries/central_columns.lib.php | 10 | ||||
-rw-r--r-- | libraries/db_designer.lib.php | 2 | ||||
-rw-r--r-- | libraries/relation.lib.php | 16 | ||||
-rw-r--r-- | libraries/relation_cleanup.lib.php | 6 | ||||
-rw-r--r-- | libraries/structure.lib.php | 12 | ||||
-rw-r--r-- | templates/columns_definitions/column_name.phtml | 4 | ||||
-rw-r--r-- | test/libraries/PMA_central_columns_test.php | 2 | ||||
-rw-r--r-- | test/libraries/PMA_server_privileges_test.php | 2 |
10 files changed, 30 insertions, 30 deletions
diff --git a/db_designer.php b/db_designer.php index 79eb6b3732..221087ee4e 100644 --- a/db_designer.php +++ b/db_designer.php @@ -91,7 +91,7 @@ if (isset($_REQUEST['operation'])) { if (! empty($cfgDesigner['user']) && ! empty($cfgDesigner['db']) && ! empty($cfgDesigner['table']) - && $GLOBALS['cfgRelation']['designer_settingswork'] + && $GLOBALS['cfgRelation']['designersettingswork'] ) { $orig_data_query = 'SELECT ' . PMA_Util::backquote('settings_data') . ' FROM `' . $cfgDesigner['db'] . '`.`' . $cfgDesigner['table'] . '` WHERE ' diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index ef8820d2df..5472ce32b7 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -500,8 +500,8 @@ class PMA_Menu } if (! $db_is_system_schema - && isset($cfgRelation['central_columnswork']) - && $cfgRelation['central_columnswork'] + && isset($cfgRelation['centralcolumnswork']) + && $cfgRelation['centralcolumnswork'] ) { $tabs['central_columns']['text'] = __('Central columns'); $tabs['central_columns']['icon'] = 'centralColumns.png'; diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 9781f679b6..e1d59f3728 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -27,8 +27,8 @@ function PMA_centralColumnsGetParams() $cfgRelation = PMA_getRelationsParam(); - if (isset($cfgRelation['central_columnswork']) - && $cfgRelation['central_columnswork'] + if (isset($cfgRelation['centralcolumnswork']) + && $cfgRelation['centralcolumnswork'] ) { $cfgCentralColumns = array( 'user' => $GLOBALS['cfg']['Server']['user'], @@ -873,7 +873,7 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db) 'Field'=>$row['col_name'] ), 'cfgRelation' => array( - 'central_columnswork' => false + 'centralcolumnswork' => false ) )) . '</td>'; @@ -1014,7 +1014,7 @@ function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num) 'Field' => $row['col_name'] ), 'cfgRelation' => array( - 'central_columnswork' => false + 'centralcolumnswork' => false ) )) . '</td>'; @@ -1261,7 +1261,7 @@ function PMA_getHTMLforAddNewColumn($db) 'ci_offset' => 0, 'columnMeta' => array(), 'cfgRelation' => array( - 'central_columnswork' => false + 'centralcolumnswork' => false ) )) . '</td>' diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php index 00ac50f48c..a96178d92e 100644 --- a/libraries/db_designer.lib.php +++ b/libraries/db_designer.lib.php @@ -184,7 +184,7 @@ function PMA_getSideMenuParamsArray() $cfgRelation = PMA_getRelationsParam(); - if ($GLOBALS['cfgRelation']['designer_settingswork']) { + if ($GLOBALS['cfgRelation']['designersettingswork']) { $query = 'SELECT `settings_data` FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['designer_settings']) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 7ef2bb7c04..d8b9552d64 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -311,7 +311,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) ); $retval .= PMA_getDiagMessageForFeature( __('Managing Central list of columns'), - 'central_columnswork', + 'centralcolumnswork', $messages ); $retval .= PMA_getDiagMessageForParameter( @@ -322,7 +322,7 @@ function PMA_getRelationsParamDiagnostic($cfgRelation) ); $retval .= PMA_getDiagMessageForFeature( __('Remembering Designer Settings'), - 'designer_settingswork', + 'designersettingswork', $messages ); $retval .= PMA_getDiagMessageForParameter( @@ -461,8 +461,8 @@ function PMA_checkRelationsParam() $cfgRelation['navwork'] = false; $cfgRelation['allworks'] = false; $cfgRelation['savedsearcheswork'] = false; - $cfgRelation['central_columnswork'] = false; - $cfgRelation['designer_settingswork'] = false; + $cfgRelation['centralcolumnswork'] = false; + $cfgRelation['designersettingswork'] = false; $cfgRelation['exporttemplateswork'] = false; $cfgRelation['user'] = null; $cfgRelation['db'] = null; @@ -604,11 +604,11 @@ function PMA_checkRelationsParam() } if (isset($cfgRelation['central_columns'])) { - $cfgRelation['central_columnswork'] = true; + $cfgRelation['centralcolumnswork'] = true; } if (isset($cfgRelation['designer_settings'])) { - $cfgRelation['designer_settingswork'] = true; + $cfgRelation['designersettingswork'] = true; } if (isset($cfgRelation['export_templates'])) { @@ -620,10 +620,10 @@ function PMA_checkRelationsParam() && $cfgRelation['mimework'] && $cfgRelation['historywork'] && $cfgRelation['recentwork'] && $cfgRelation['uiprefswork'] && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork'] - && $cfgRelation['bookmarkwork'] && $cfgRelation['central_columnswork'] + && $cfgRelation['bookmarkwork'] && $cfgRelation['centralcolumnswork'] && $cfgRelation['menuswork'] && $cfgRelation['navwork'] && $cfgRelation['savedsearcheswork'] && $cfgRelation['favoritework'] - && $cfgRelation['designer_settingswork'] + && $cfgRelation['designersettingswork'] && $cfgRelation['exporttemplateswork'] ) { $cfgRelation['allworks'] = true; diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index 1af6bca0de..f1e176e7d2 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -203,8 +203,8 @@ function PMA_relationsCleanupDatabase($db) PMA_queryAsControlUser($remove_query); } - if (isset($cfgRelation['central_columnswork']) - && $cfgRelation['central_columnswork'] + if (isset($cfgRelation['centralcolumnswork']) + && $cfgRelation['centralcolumnswork'] ) { $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['central_columns']) @@ -285,7 +285,7 @@ function PMA_relationsCleanupUser($username) PMA_queryAsControlUser($remove_query); } - if ($cfgRelation['designer_settingswork']) { + if ($cfgRelation['designersettingswork']) { $remove_query = "DELETE FROM " . PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation['designer_settings']) . " WHERE `username` = '" . PMA_Util::sqlAddSlashes($username) . "'"; diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 1fa6a61eb5..1e896e3755 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -356,8 +356,8 @@ function PMA_getHtmlForCheckAllTables($pmaThemeImage, $text_dir, $html_output .= '</optgroup>'; } - if (isset($GLOBALS['cfgRelation']['central_columnswork']) - && $GLOBALS['cfgRelation']['central_columnswork'] + if (isset($GLOBALS['cfgRelation']['centralcolumnswork']) + && $GLOBALS['cfgRelation']['centralcolumnswork'] ) { $html_output .= '<optgroup label="' . __('Central columns') . '">'; $html_output .= '<option value="sync_unique_columns_central_list" >' @@ -1567,8 +1567,8 @@ function PMA_getHtmlForCheckAllTableColumn($pmaThemeImage, $text_dir, __('Fulltext'), 'b_ftext.png', 'ftext' ); } - if (isset($GLOBALS['cfgRelation']['central_columnswork']) - && $GLOBALS['cfgRelation']['central_columnswork'] + if (isset($GLOBALS['cfgRelation']['centralcolumnswork']) + && $GLOBALS['cfgRelation']['centralcolumnswork'] ) { $html_output .= PMA_Util::getButtonOrImage( 'submit_mult', 'mult_submit', 'submit_mult_central_columns_add', @@ -2191,8 +2191,8 @@ function PMA_getHtmlForActionsInTableStructure($type, $tbl_storage_engine, ); } $html_output .= PMA_getHtmlForDistinctValueAction($url_query, $row, $titles); - if (isset($GLOBALS['cfgRelation']['central_columnswork']) - && $GLOBALS['cfgRelation']['central_columnswork'] + if (isset($GLOBALS['cfgRelation']['centralcolumnswork']) + && $GLOBALS['cfgRelation']['centralcolumnswork'] ) { $html_output .= '<li class="browse nowrap">'; if ($isInCentralColumns) { diff --git a/templates/columns_definitions/column_name.phtml b/templates/columns_definitions/column_name.phtml index 80b0993005..d382754a81 100644 --- a/templates/columns_definitions/column_name.phtml +++ b/templates/columns_definitions/column_name.phtml @@ -32,8 +32,8 @@ if (empty($title)) { value="<?php if (isset($columnMeta['Field'])) echo htmlspecialchars($columnMeta['Field']); ?>" /> -<?php if (isset($cfgRelation['central_columnswork']) - && $cfgRelation['central_columnswork'] +<?php if (isset($cfgRelation['centralcolumnswork']) + && $cfgRelation['centralcolumnswork'] && !(isset($columnMeta['column_status']) && !$columnMeta['column_status']['isEditable']) ): ?> diff --git a/test/libraries/PMA_central_columns_test.php b/test/libraries/PMA_central_columns_test.php index d540ab32d1..787cd2c7ca 100644 --- a/test/libraries/PMA_central_columns_test.php +++ b/test/libraries/PMA_central_columns_test.php @@ -91,7 +91,7 @@ class PMA_Central_Columns_Test extends PHPUnit_Framework_TestCase $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); $_SESSION['PMA_Theme'] = new PMA_Theme(); $_SESSION['relation'][1] = array( - 'central_columnswork' => true, + 'centralcolumnswork' => true, 'relwork' => 1, 'db' => 'phpmyadmin', 'relation' => 'relation', diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index bd23b2d1d2..f989a849d3 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -1872,7 +1872,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase 'menuswork' => false, 'navwork' => false, 'savedsearcheswork' => false, - 'designer_settingswork' => false, + 'designersettingswork' => false, ); $queries = array(); |