kalle           Thu Feb 12 14:36:32 2009 UTC

  Modified files:              
    /php-src    php.ini-dist php.ini-recommended 
  Log:
  Fixed wrong usage of error_reporting directive
  
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.288&r2=1.289&diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.288 php-src/php.ini-dist:1.289
--- php-src/php.ini-dist:1.288  Sat Jan 31 19:23:16 2009
+++ php-src/php.ini-dist        Thu Feb 12 14:36:32 2009
@@ -222,7 +222,7 @@
 
 ; error_reporting is a bit-field.  Or each number up to get desired error
 ; reporting level
-; E_ALL             - All errors and warnings (doesn't include E_STRICT)
+; E_ALL             - All errors and warnings (includes E_STRICT)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR     - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)
@@ -232,7 +232,7 @@
 ;                     intentional (e.g., using an uninitialized variable and
 ;                     relying on the fact it's automatically initialized to an
 ;                     empty string)
-; E_STRICT                     - run-time notices, enable to have PHP suggest 
changes
+; E_STRICT         - run-time notices, enable to have PHP suggest changes
 ;                     to your code which will ensure the best interoperability
 ;                     and forward compatibility of your code
 ; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
@@ -251,11 +251,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
+;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL & ~E_NOTICE
+;error_reporting = E_ALL | ~E_NOTICE
 ;
 ;   - Show only errors
 ;
@@ -263,7 +263,7 @@
 ;
 ;   - Show all errors, except coding standards warnings
 ;
-error_reporting  =  E_ALL & ~E_STRICT
+error_reporting  =  E_ALL | ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.238&r2=1.239&diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.238 php-src/php.ini-recommended:1.239
--- php-src/php.ini-recommended:1.238   Sat Jan 31 19:23:16 2009
+++ php-src/php.ini-recommended Thu Feb 12 14:36:32 2009
@@ -259,7 +259,7 @@
 
 ; error_reporting is a bit-field.  Or each number up to get desired error
 ; reporting level
-; E_ALL             - All errors and warnings (doesn't include E_STRICT)
+; E_ALL             - All errors and warnings (includes E_STRICT)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR     - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)
@@ -288,11 +288,11 @@
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
+;error_reporting = E_ALL | ~E_NOTICE | ~E_STRICT
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL & ~E_NOTICE
+;error_reporting = E_ALL | ~E_NOTICE
 ;
 ;   - Show only errors
 ;
@@ -300,7 +300,7 @@
 ;
 ;   - Show all errors, except coding standards warnings
 ;
-error_reporting  =  E_ALL & ~E_STRICT
+error_reporting  =  E_ALL | ~E_STRICT
 
 ; Print out errors (as a part of the output).  For production web sites,
 ; you're strongly encouraged to turn this feature off, and use error logging



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to