From 0f720c53752e260e4384f8172c4501c5aba30088 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 31 Mar 2015 18:52:38 +0530
Subject: [PATCH] bug #4754 pMA DB not detected properly

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                | 1 +
 libraries/common.inc.php | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d351b7699e..b18d5de60e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,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
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index c1476de726..e859199ca0 100644
--- a/libraries/common.inc.php
+++ b/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);
+            }
+        }
+    }
 }
 ?>