diff --git a/index.php b/index.php index b2013fd229..2c3ec25f6b 100644 --- a/index.php +++ b/index.php @@ -117,9 +117,9 @@ if ($server > 0 || count($cfg['Servers']) > 1 /** * Displays the MySQL servers choice form */ - if ($cfg['ServerDefault'] == 0 + if ($cfg['ServerDefault'] == 0 || (! $cfg['NavigationDisplayServers'] - && (count($cfg['Servers']) > 1 + && (count($cfg['Servers']) > 1 || ($server == 0 && count($cfg['Servers']) == 1) ) ) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index c7412a9a93..e5766e51e4 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -305,7 +305,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') PMA_fatalError($message); } else { $GLOBALS['error_handler']->addError( - $message, + $message, E_USER_WARNING, '', '', diff --git a/libraries/error.inc.php b/libraries/error.inc.php index 7e3f8ae118..c48a7f1422 100644 --- a/libraries/error.inc.php +++ b/libraries/error.inc.php @@ -13,10 +13,6 @@ if (! defined('PHPMYADMIN')) { if (! defined('TESTSUITE')) { header('Content-Type: text/html; charset=utf-8'); } - -require_once 'libraries/Response.class.php'; -PMA_Response::getInstance()->disable(); - ?>