From 235b0e9631eb1d948b5b5931e2f15db589d757fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sat, 10 Feb 2018 16:47:18 -0200 Subject: [PATCH] Fix case in which checkServers is never called MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there is no configuration file, the checkServers() method will never be called. Fix #13769 Signed-off-by: Maurício Meneghini Fauth --- libraries/classes/Config.php | 2 -- libraries/common.inc.php | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php index f7c37814d9..5b772c649e 100644 --- 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; } diff --git a/libraries/common.inc.php b/libraries/common.inc.php index d23669507c..957b05991a 100644 --- 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']