Merge remote-tracking branch 'origin/master'

2013-06-11 09:00:31 +02:00 · 2013-06-11 09:00:31 +02:00 · 24cb1cfac5
commit 24cb1cfac5
parent 00ef3cc354 5e6d3eaa53
3 changed files with 3 additions and 7 deletions
--- 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)
            )
        )
--- 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,
            '',
            '',
--- 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();
-
 ?>
 <!DOCTYPE HTML>
 <html lang="<?php echo $lang; ?>" dir="<?php echo $dir; ?>">