Fix bug 3977 - Not detected configuration storage

phpmyadmin · Jun 14, 2013 · c6d568d · c6d568d
1 parent 0717e36
commit c6d568d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
 ======================
 
 4.0.5.0 (not yet released)
+- bug #3977 Not detected configuration storage
 
 4.0.4.0 (not yet released)
 - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click

diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php
@@ -85,12 +85,15 @@ public function getFromDb()
             = " SELECT `tables` FROM " . $this->_pmaTable .
             " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'";
 
-        $row = PMA_DBI_fetch_array(PMA_queryAsControlUser($sql_query));
-        if (isset($row[0])) {
-            return json_decode($row[0], true);
-        } else {
-            return array();
+        $return = array();
+        $result = PMA_queryAsControlUser($sql_query, false);
+        if ($result) {
+            $row = PMA_DBI_fetch_array($result);
+            if (isset($row[0])) {
+                $return = json_decode($row[0], true);
+            }
         }
+        return $return;
     }
 
     /**