From 4ada1af8cfbf8a9198478f437efe07955ea77e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Thu, 18 Oct 2012 09:29:03 +0200
Subject: [PATCH] Test for config existance

This can be not present in some testcases.
---
 libraries/Error_Handler.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index 5bb537505b..5295f22997 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -50,12 +50,12 @@ class PMA_Error_Handler
      */
     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'],