diff --git a/libraries/Partition.class.php b/libraries/Partition.class.php index 243fd8649c..72137f81a3 100644 --- a/libraries/Partition.class.php +++ b/libraries/Partition.class.php @@ -63,7 +63,7 @@ class PMA_Partition } else { // see http://dev.mysql.com/doc/refman/5.6/en/partitioning.html $plugins = PMA_DBI_fetch_result("SHOW PLUGINS"); - foreach ($plugins as $key => $value) { + foreach ($plugins as $value) { if ($value['Name'] == 'partition') { $have_partitioning = true; break; diff --git a/libraries/Scripts.class.php b/libraries/Scripts.class.php index 58cfbe89ce..c0d64d8ab1 100644 --- a/libraries/Scripts.class.php +++ b/libraries/Scripts.class.php @@ -52,7 +52,7 @@ class PMA_Scripts { $dynamic_scripts = ""; $params = array(); - foreach ($files as $key => $value) { + foreach ($files as $value) { if (strpos($value['filename'], "?") === false) { $include = true; if ($value['conditional_ie'] !== false && PMA_USR_BROWSER_AGENT === 'IE') { diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php index a29c460950..e5a400bbe5 100644 --- a/libraries/TableSearch.class.php +++ b/libraries/TableSearch.class.php @@ -127,7 +127,7 @@ class PMA_TableSearch // Get details about the geometry fucntions $geom_types = PMA_Util::getGISDatatypes(); - foreach ($columns as $key => $row) { + foreach ($columns as $row) { // set column name $this->_columnNames[] = $row['Field']; diff --git a/libraries/core.lib.php b/libraries/core.lib.php index c702387956..ccce887fa2 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -228,11 +228,6 @@ function PMA_fatalError( } } - $error_header = __('Error'); - - $lang = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; - $dir = $GLOBALS['text_dir']; - // on fatal errors it cannot hurt to always delete the current session if ($delete_session && isset($GLOBALS['session_name']) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index f4dcaf75cf..b865badf5b 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -192,15 +192,12 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $result = PMA_DBI_real_query($query, $link, $options); if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows( - $link, $get_from_cache = false - ); + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, false); } if ($GLOBALS['cfg']['DBG']['sql']) { $time = microtime(true) - $time; PMA_DBI_DBG_query($query, $link, $result, $time); - } if ($result != false && PMA_Tracker::isActive() == true ) { PMA_Tracker::handleQuery($query); @@ -2024,7 +2021,7 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//') // Sort results by name $name = array(); - foreach ($result as $key => $value) { + foreach ($result as $value) { $name[] = $value['name']; } array_multisort($name, SORT_ASC, $result); diff --git a/libraries/display_select_lang.lib.php b/libraries/display_select_lang.lib.php index dacb7a5730..41a9098d2f 100644 --- a/libraries/display_select_lang.lib.php +++ b/libraries/display_select_lang.lib.php @@ -35,7 +35,7 @@ function PMA_languageCmp($a, $b) */ function PMA_getLanguageSelectorHtml($use_fieldset = false, $show_doc = true) { - global $cfg, $lang; + global $lang; $retval = ''; @@ -66,7 +66,8 @@ function PMA_getLanguageSelectorHtml($use_fieldset = false, $show_doc = true) . $language_title . ': '; } - $retval .= ''; uasort($GLOBALS['available_languages'], 'PMA_languageCmp'); foreach ($GLOBALS['available_languages'] as $id => $tmplang) { diff --git a/libraries/file_listing.lib.php b/libraries/file_listing.lib.php index 70ee20a244..e5b680c2ca 100644 --- a/libraries/file_listing.lib.php +++ b/libraries/file_listing.lib.php @@ -59,7 +59,7 @@ function PMA_getFileSelectOptions($dir, $extensions = '', $active = '') return false; } $result = ''; - foreach ($list as $key => $val) { + foreach ($list as $val) { $result .= '