Test for config existance

This can be not present in some testcases.
phpmyadmin · Oct 18, 2012 · 4ada1af · 4ada1af
1 parent 8a05873
commit 4ada1af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
@@ -50,12 +50,12 @@ public function __construct()
      */
     public function __destruct()
     {
-        if (!defined('TESTSUITE') && isset($_SESSION)) {
+        if (isset($_SESSION)) {
             if (! isset($_SESSION['errors'])) {
                 $_SESSION['errors'] = array();
             }
 
-            if ($GLOBALS['cfg']['Error_Handler']['gather']) {
+            if (isset($GLOBALS['cfg']['Error_Handler']) && $GLOBALS['cfg']['Error_Handler']['gather']) {
                 // remember all errors
                 $_SESSION['errors'] = array_merge(
                     $_SESSION['errors'],