Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -110,6 +110,7 @@ phpMyAdmin - ChangeLog
 - issue #13084 Do not point users to setup when it is disabled
 - issue #12660 Delete only phpMyAdmin cookies on upgrade
 - issue #13088 Fixed editing of rows with text primary key
+- issue #13092 Do not try to sync favorite tables if configuration storage is not enabled
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

libraries/RecentFavoriteTable.php

@@ -346,10 +346,9 @@ class RecentFavoriteTable
         if ($server_id == 0) {
             return '';
         }
+        $cfgRelation = PMA_getRelationsParam();
         // Not to show this once list is synchronized.
-        $is_synced = isset($_SESSION['tmpval']['favorites_synced'][$server_id]) ?
-            true : false;
-        if (!$is_synced) {
+        if ($cfgRelation['favoritework'] && ! isset($_SESSION['tmpval']['favorites_synced'][$server_id])) {
             $params  = array('ajax_request' => true, 'favorite_table' => true,
                 'sync_favorite_tables' => true);
             $url     = 'db_structure.php' . URL::getCommon($params);

libraries/controllers/database/DatabaseStructureController.php

@@ -233,7 +233,10 @@ class DatabaseStructureController extends DatabaseController
 
         // Request for Synchronization of favorite tables.
         if (isset($_REQUEST['sync_favorite_tables'])) {
-            $this->synchronizeFavoriteTables($fav_instance, $user, $favorite_tables);
+            $cfgRelation = PMA_getRelationsParam();
+            if ($cfgRelation['favoritework']) {
+                $this->synchronizeFavoriteTables($fav_instance, $user, $favorite_tables);
+            }
             return;
         }
         $changes = true;