From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 19 May 2010 15:47:20 +0000 (-0400)
Subject: Use the return value from error_reporting() instead of a $GLOBAL['conf'] value
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=27b2e23f96c93b7f115b8e2f1bb66eba248b3365;p=horde.git

Use the return value from error_reporting() instead of a $GLOBAL['conf'] value
---

diff --git a/framework/Image/lib/Horde/Image/Gd.php b/framework/Image/lib/Horde/Image/Gd.php
index bcc5f8a9d..9701cf7e2 100644
--- a/framework/Image/lib/Horde/Image/Gd.php
+++ b/framework/Image/lib/Horde/Image/Gd.php
@@ -775,12 +775,12 @@ class Horde_Image_Gd extends Horde_Image_Base
         unset($php_errormsg);
         $track = ini_set('track_errors', 1);
         $error_mask = E_ALL & ~E_WARNING & ~E_NOTICE;
-        error_reporting($error_mask);
+        $old_reporting = error_reporting($error_mask);
         $result = call_user_func_array($function, $params);
         if ($track !== false) {
             ini_set('track_errors', $track);
         }
-        error_reporting($GLOBALS['conf']['debug_level']);
+        error_reporting($old_reporting);
         if (!empty($php_errormsg)) {
             $error_msg = $php_errormsg;
             throw new Horde_Image_Exception($error_msg);