Merge remote-tracking branch 'origin/master'

2018-02-13 14:17:11 +01:00 · 2018-02-13 14:17:11 +01:00 · e2373e94fb
commit e2373e94fb
parent 7fa1f4c028 1bde54959a
2 changed files with 2 additions and 2 deletions
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@ -833,8 +833,6 @@ class Config

        $this->settings = array_replace_recursive($this->settings, $cfg);

-        $this->checkServers();
-
        return true;
    }

--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@ -277,6 +277,8 @@ Core::checkRequest();
 /******************************************************************************/
 /* setup servers                                       LABEL_setup_servers    */

+$GLOBALS['PMA_Config']->checkServers();
+
 /**
 * current server
 * @global integer $GLOBALS['server']