diff --git a/ChangeLog b/ChangeLog index a61a573b6..4e20e331c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ phpMyAdmin - ChangeLog ====================== +3.4.11.0 (not yet released) + 3.4.10.0 (not yet released) - bug #3460090 [interface] TextareaAutoSelect feature broken - patch #3375984 [export] PHP Array export might generate invalid php code diff --git a/Documentation.html b/Documentation.html index 1d575953b..8731708b0 100644 --- a/Documentation.html +++ b/Documentation.html @@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.4.10-rc1 - Documentation + phpMyAdmin 3.4.11-dev - Documentation @@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 77c11da1d..aa9c27950 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.10-rc1 +Version 3.4.11-dev A set of PHP-scripts to manage MySQL over the web. diff --git a/db_tracking.php b/db_tracking.php index c0421d600..fabd82574 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -161,7 +161,7 @@ foreach ($table_list as $key => $value) { foreach ($value as $temp_table) { // If $temp_table is a table with the value for 'Name' is set, // rather than a propery of the table group. - if (array_key_exists('Name', $temp_table)) { + if (is_array($temp_table) && array_key_exists('Name', $temp_table)) { if (PMA_Tracker::getVersion($GLOBALS['db'], $temp_table['Name']) == -1) { $my_tables[] = $temp_table['Name']; } diff --git a/libraries/Config.class.php b/libraries/Config.class.php index ad0ecda42..f6d6c63df 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -96,7 +96,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.10-rc1'); + $this->set('PMA_VERSION', '3.4.11-dev'); /** * @deprecated */