Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4

Conflicts:
	Documentation.html
	README
	libraries/Config.class.php

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

Documentation.html

@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.10-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.4.11-dev - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.10-rc1
+        3.4.11-dev
         Documentation
     </h1>
 </div>

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.
 

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'];
                 }

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
          */