Merge branch 'QA_4_3'

NenadGajic · Jan 23, 2015 · c8a25c1 · c8a25c1
2 parents b46c42b + 189173f
commit c8a25c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -37,6 +37,7 @@ phpMyAdmin - ChangeLog
 - bug #4717 Database navigation menu broken when resolution/screen is changing
 - bug #4727 Collation column missing in database list when DisableIS is true
 - bug       Undefined index central_columnswork
+- bug       Undefined index favorite_tables 
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
@@ -2914,7 +2914,11 @@ function PMA_getHtmlForFavoriteAnchor($db, $current_table, $titles)
 function PMA_addRemoveFavoriteTables($db)
 {
     $fav_instance = PMA_RecentFavoriteTable::getInstance('favorite');
-    $favorite_tables = json_decode($_REQUEST['favorite_tables'], true);
+    if (isset($_REQUEST['favorite_tables'])) {
+        $favorite_tables = json_decode($_REQUEST['favorite_tables'], true);
+    } else {
+        $favorite_tables = array();
+    }
     // Required to keep each user's preferences separate.
     $user = sha1($GLOBALS['cfg']['Server']['user']);