Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
 - bug       Missing sort icons in monitor
 - bug #4805 Inline edit broken when using functions in query
 - bug #4821 Timed-out import fails to restart when file represented
+- bug #4754 pMA DB not detected properly
 
 4.4.0.0 (not yet released)
 + rfe #1553 InnoDB presently supports one FULLTEXT index creation at a time

libraries/common.inc.php

@@ -1184,5 +1184,13 @@ if (! defined('PMA_MINIMUM_COMMON')
             PMA_fixPMATables($GLOBALS['db'], false);
         }
     }
+    $cfgRelation = PMA_getRelationsParam();
+    if (empty($cfgRelation['db'])) {
+        foreach ($GLOBALS['pma']->databases as $database) {
+            if ($database == 'phpmyadmin') {
+                PMA_fixPMATables($database, false);
+            }
+        }
+    }
 }
 ?>