From c7bb1d9871f077a2b078fa3da61513df53af95d3 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 19 Feb 2006 14:27:39 +0000
Subject: [PATCH] re-establish previous error reporting

---
 ChangeLog                | 3 +++
 libraries/common.lib.php | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 887190835..c4aa16899 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-02-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/common.lib.php: re-establish previous error reporting mode
+
 2006-02-19 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php PMA_getUvaCondition():
        - fixed missing $analyzed_sql (partly bug #1431615)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 376b082ed..9c8aa3f86 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -45,6 +45,8 @@ if (defined('E_STRICT')) {
     $old_error_reporting = error_reporting(0);
     if ($old_error_reporting & E_STRICT) {
         error_reporting($old_error_reporting ^ E_STRICT);
+    } else {
+        error_reporting($old_error_reporting);
     }
     unset($old_error_reporting);
 }