summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Sommer Nielsen <kalle@php.net>2009-02-12 14:36:32 +0000
committerKalle Sommer Nielsen <kalle@php.net>2009-02-12 14:36:32 +0000
commite23ca993c763962001b493494d2b84c32a674a09 (patch)
treede8eaea85fcfee8f156f5e2fd38a9415bd1614a4
parent31bdcfec8f54aebf7cbd7dd602d899e7d610f3bc (diff)
downloadphp-git-e23ca993c763962001b493494d2b84c32a674a09.tar.gz
Fixed wrong usage of error_reporting directive
-rw-r--r--php.ini-dist10
-rw-r--r--php.ini-recommended8
2 files changed, 9 insertions, 9 deletions
diff --git a/php.ini-dist b/php.ini-dist
index a9ce9a1229..c58336be7b 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -222,7 +222,7 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
; 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 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
; 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 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
;
; - 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 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
;
; - 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
diff --git a/php.ini-recommended b/php.ini-recommended
index 6582dd398b..06a5bdcea5 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -259,7 +259,7 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
; 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 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
;
; - 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 @@ memory_limit = 128M ; Maximum amount of memory a script may consume (128M)
;
; - 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