Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 235b0e9631eb1d948b5b5931e2f15db589d757fd https://github.com/phpmyadmin/phpmyadmin/commit/235b0e9631eb1d948b5b5931e2f1... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2018-02-10 (Sat, 10 Feb 2018) Changed paths: M libraries/classes/Config.php M libraries/common.inc.php Log Message: ----------- Fix case in which checkServers is never called If there is no configuration file, the checkServers() method will never be called. Fix #13769 Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Commit: 1bde54959a1962d123ed93f1b66d802e60301942 https://github.com/phpmyadmin/phpmyadmin/commit/1bde54959a1962d123ed93f1b66d... Author: Maurício Meneghini Fauth <mauriciofauth@gmail.com> Date: 2018-02-12 (Mon, 12 Feb 2018) Changed paths: M libraries/classes/Config.php M libraries/common.inc.php Log Message: ----------- Merge pull request #13988 from mauriciofauth/issue-13769 Fix case in which Config::checkServers is never called Compare: https://github.com/phpmyadmin/phpmyadmin/compare/00c112befeb4...1bde54959a19