From: Derick Rethans <derick@php.net>
Date: Sun, 6 Nov 2005 11:09:32 +0000 (+0000)
Subject: - MFH: E_STRICT is not part of E_ALL, so the lines were wrong here.
X-Git-Tag: php-5.1.0RC5~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15c1b8a3a2b869972eb2dcdb6f80dfa526eeb362;p=php

- MFH: E_STRICT is not part of E_ALL, so the lines were wrong here.
---

diff --git a/php.ini-dist b/php.ini-dist
index 9cd7249b50..49197f1dbb 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -277,11 +277,11 @@ memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
+;error_reporting = E_ALL & ~E_NOTICE
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL & ~E_NOTICE
+;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
 ;
 ;   - Show only errors
 ;
@@ -289,7 +289,7 @@ memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 ;
 ;   - Show all errors except for notices and coding standards warnings
 ;
-error_reporting  =  E_ALL & ~E_NOTICE & ~E_STRICT
+error_reporting  =  E_ALL & ~E_NOTICE
 
 ; 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
diff --git a/php.ini-recommended b/php.ini-recommended
index 7b47216285..8a49b3e58a 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -335,11 +335,11 @@ memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
 ;
 ;   - Show all errors, except for notices and coding standards warnings
 ;
-;error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT
+;error_reporting = E_ALL & ~E_NOTICE
 ;
 ;   - Show all errors, except for notices
 ;
-;error_reporting = E_ALL & ~E_NOTICE
+;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
 ;
 ;   - Show only errors
 ;