Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Dec 31, 2014 · 7473514 · 7473514
2 parents dde2799 + 7c4b270
commit 7473514
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 
 4.3.5.0 (not yet released)
 - bug       Auto-configuration: tables were not created automatically
+- bug #4677 Advanced feature checker does not check for favorite tables feature
 
 4.3.4.0 (2014-12-29)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"

diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
@@ -214,6 +214,17 @@ function PMA_getRelationsParamDiagnostic($cfgRelation)
             'recentwork',
             $messages
         );
+        $retval .= PMA_getDiagMessageForParameter(
+            'favorite',
+            isset($cfgRelation['favorite']),
+            $messages,
+            'favorite'
+        );
+        $retval .= PMA_getDiagMessageForFeature(
+            __('Persistent favorite tables'),
+            'favoritework',
+            $messages
+        );
         $retval .= PMA_getDiagMessageForParameter(
             'table_uiprefs',
             isset($cfgRelation['table_uiprefs']),
@@ -414,6 +425,7 @@ function PMA_checkRelationsParam()
     $cfgRelation['mimework']       = false;
     $cfgRelation['historywork']    = false;
     $cfgRelation['recentwork']     = false;
+    $cfgRelation['favoritework']   = false;
     $cfgRelation['uiprefswork']    = false;
     $cfgRelation['trackingwork']   = false;
     $cfgRelation['userconfigwork'] = false;
@@ -477,6 +489,8 @@ function PMA_checkRelationsParam()
             $cfgRelation['history']         = $curr_table[0];
         } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['recent']) {
             $cfgRelation['recent']          = $curr_table[0];
+        } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['favorite']) {
+            $cfgRelation['favorite']        = $curr_table[0];
         } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_uiprefs']) {
             $cfgRelation['table_uiprefs']   = $curr_table[0];
         } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) {
@@ -523,6 +537,10 @@ function PMA_checkRelationsParam()
         $cfgRelation['recentwork']      = true;
     }
 
+    if (isset($cfgRelation['favorite'])) {
+        $cfgRelation['favoritework']    = true;
+    }
+
     if (isset($cfgRelation['table_uiprefs'])) {
         $cfgRelation['uiprefswork']     = true;
     }
@@ -562,7 +580,7 @@ function PMA_checkRelationsParam()
         && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork']
         && $cfgRelation['bookmarkwork'] && $cfgRelation['central_columnswork']
         && $cfgRelation['menuswork'] && $cfgRelation['navwork']
-        && $cfgRelation['savedsearcheswork']
+        && $cfgRelation['savedsearcheswork'] && $cfgRelation['favoritework']
     ) {
         $cfgRelation['allworks'] = true;
     }
@@ -1774,7 +1792,7 @@ function PMA_searchColumnInForeigners($foreigners, $column)
 }
 
 /**
- * Whether we found a set of tables in the specified db 
+ * Whether we found a set of tables in the specified db
  *
  * @param string $db     Database
  * @param array  $tables Table names

diff --git a/test/libraries/PMA_relation_cleanup_test.php b/test/libraries/PMA_relation_cleanup_test.php
@@ -45,6 +45,7 @@ public function setUp()
         $GLOBALS['cfg']['Server']['pdf_pages'] = 'pdf_pages';
         $GLOBALS['cfg']['Server']['history'] = 'history';
         $GLOBALS['cfg']['Server']['recent'] = 'recent';
+        $GLOBALS['cfg']['Server']['favorite'] = 'favorite';
         $GLOBALS['cfg']['Server']['table_uiprefs'] = 'table_uiprefs';
         $GLOBALS['cfg']['Server']['tracking'] = 'tracking';
         $GLOBALS['cfg']['Server']['userconfig'] = 'userconfig';