Merge branch 'QA_4_9' into QA_5_0

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Jan 6, 2020 · bd808c8 · bd808c8
2 parents d01dab8 + 156231d
commit bd808c8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -1643,8 +1643,10 @@ public function initRelationParamsCache()
             }
         }
         $cfgRelation = $this->relation->getRelationsParam();
-        if (empty($cfgRelation['db']) && $GLOBALS['dblist']->databases->exists('phpmyadmin')) {
-            $this->relation->fixPmaTables('phpmyadmin', false);
+        if (empty($cfgRelation['db']) && isset($GLOBALS['dblist'])) {
+            if ($GLOBALS['dblist']->databases->exists('phpmyadmin')) {
+                $this->relation->fixPmaTables('phpmyadmin', false);
+            }
         }
     }