[SM-CVS] CVS: squirrelmail/class error.class.php,1.2,1.3

Update of /cvsroot/squirrelmail/squirrelmail/class
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10224

Modified Files:
        error.class.php 
Log Message:
more php 4.1.2 testing. it is possible that ini_get call is not needed.


Index: error.class.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/class/error.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- error.class.php     31 Jul 2005 12:13:30 -0000      1.2
+++ error.class.php     3 Aug 2005 12:19:53 -0000       1.3
@@ -69,12 +69,22 @@
         $aErrorCategory = array();
 
         /**
+         * Get current error reporting level.
+         *
+         * PHP 4.1.2 does not return current error reporting level in ini_get 
(php 5.1b3 and 
+         * 4.3.10 does). Retrieve current error reporting level while setting 
error reporting 
+         * to ini value and reset it to retrieved value.
+         */
+        $iCurErrLevel = error_reporting(ini_get('error_reporting'));
+        error_reporting($iCurErrLevel);
+
+        /**
          * Check error_reporting value before logging error.
          * Don't log errors that are disabled by @ (error_reporting = 0). Some 
SquirrelMail scripts
          * (sq_mb_list_encodings(), ldap function calls in 
functions/abook_ldap_server.php)
          * handle errors themselves and @ is used to disable generic php error 
messages.
          */
-        if ((bool) ini_get('error_reporting')) {
+        if ((bool) $iCurErrLevel) {
             /*
              * The following errors cannot be handled by a user defined error 
handler:
              * E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, 
E_COMPILE_ERROR, E_COMPILE_WARNING



-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@xxxxxxxxxxxxxxxx
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs