diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 33b4f423bc..8b742f1123 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -1962,7 +1962,6 @@ class PMA_DisplayResults $sort_tbl_new = $matches[0]; } - // $name_to_use_in_sort might contain a space due to // formatting of function expressions like "COUNT(name )" // so we remove the space in this situation @@ -3153,7 +3152,6 @@ class PMA_DisplayResults $linking_url_params[$link_relations['link_param'][0]] = $sql; } - if (! empty($link_relations['link_dependancy_params'])) { foreach ($link_relations['link_dependancy_params'] as $new_param) { @@ -4587,7 +4585,6 @@ class PMA_DisplayResults $table_html .= "\n" . '

' . "\n"; } - // 6. ----- Prepare "Query results operations" if ((! isset($printview) || ($printview != '1')) && ! $is_limited_display) { $table_html .= $this->_getResultsOperations( diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index e41ea6f077..56a6058544 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -173,7 +173,6 @@ class PMA_Menu $separator = " ยป"; $item = ''; - if (PMA_Util::showText('TabsMode')) { $item .= '%4$s: '; } diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index 028eada50c..78c02ab837 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -270,7 +270,6 @@ class PMA_ServerStatusData ); $links['innodb']['doc'] = 'innodb'; - // Variable to contain all com_ variables (query statistics) $used_queries = array(); diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 2fda80be91..a426cadf04 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -1173,7 +1173,6 @@ class PMA_Table $new_fields ); - /** * @todo revise this code when we support cross-db relations */ @@ -1199,7 +1198,6 @@ class PMA_Table $new_fields ); - $get_fields = array( 'foreign_field', 'master_table', @@ -1222,7 +1220,6 @@ class PMA_Table $new_fields ); - $get_fields = array('x', 'y', 'v', 'h'); $where_fields = array( 'db_name' => $source_db, diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index d12689ea05..27eecfcade 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -131,7 +131,6 @@ class PMA_Theme_Manager $this->theme = new PMA_Theme; - if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) { trigger_error( sprintf( diff --git a/libraries/Types.class.php b/libraries/Types.class.php index 3d8ed825fb..68060de901 100644 --- a/libraries/Types.class.php +++ b/libraries/Types.class.php @@ -664,7 +664,6 @@ class PMA_Types_MySQL extends PMA_Types 'SERIAL', ); - // Date/Time $ret[_pgettext('date and time types', 'Date and time')] = array( 'DATE', diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php index cddadb93de..c2975ed4ac 100644 --- a/libraries/create_addfield.lib.php +++ b/libraries/create_addfield.lib.php @@ -95,7 +95,6 @@ function PMA_buildColumnCreationStatement( $field_primary ); - $definition .= PMA_setColumnCreationStatementSuffix($i, $is_create_tbl); $definitions[] = $definition; } // end for diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 0a7d44f793..817af47da2 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -135,7 +135,6 @@ function PMA_getHtmlForHiddenInput( $html .= ''; - if (isset($_GET['sql_query'])) { $html .= '' . "\n"; diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 8150eec1a2..6ba8dea045 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -436,7 +436,6 @@ function PMA_checkRelationsParam() return $cfgRelation; } - $cfgRelation['user'] = $GLOBALS['cfg']['Server']['user']; $cfgRelation['db'] = $GLOBALS['cfg']['Server']['pmadb']; diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index e9ac9a06bc..a3d58f9d04 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -525,7 +525,6 @@ function PMA_getHtmlForReplicationStatusTable($type, $hidden = false, $title = t $html .= ' '; $html .= ' '; - // TODO change to regexp or something, to allow for negative match if (isset(${"{$type}_variables_alerts"}[$variable]) && ${"{$type}_variables_alerts"}[$variable] == ${"server_{$type}_replication"}[0][$variable] diff --git a/libraries/server_engines.lib.php b/libraries/server_engines.lib.php index f8c9710171..725b74d449 100644 --- a/libraries/server_engines.lib.php +++ b/libraries/server_engines.lib.php @@ -52,7 +52,6 @@ function PMA_getHtmlForAllServerEngines() . '' . "\n" . '' . "\n"; - /** * Listing the storage engines */ diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 9b0c03027a..1d63556f91 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -1273,7 +1273,6 @@ function PMA_getHtmlForLoginInformationFields($mode = 'new') $html_output .= '