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

- 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 c9429bf23d..8a281663b0 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -278,11 +278,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
 ;
@@ -290,7 +290,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 1baad550b5..005c19ba96 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -336,11 +336,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
 ;