diff options
author | Michael Hamann <michael@content-space.de> | 2012-01-15 11:30:38 +0100 |
---|---|---|
committer | Michael Hamann <michael@content-space.de> | 2012-01-15 11:37:12 +0100 |
commit | 4fcd684a8a5eb25a7c51dfcb55838fbfc523858f (patch) | |
tree | 4cdcaf218d1093d636c7fdffb9ebfc6a9d73d613 /inc/init.php | |
parent | 4725165754f92ab9a0e81ee7c69109b0a2f9f35d (diff) | |
download | rpg-4fcd684a8a5eb25a7c51dfcb55838fbfc523858f.tar.gz rpg-4fcd684a8a5eb25a7c51dfcb55838fbfc523858f.tar.bz2 |
Disable E_STRICT error reporting
This change disables the reporting of strict standard errors in PHP 5.4,
in PHP versions prior to 5.4 E_STRICT wasn't part of E_ALL so for
these versions this doesn't cause any change (however E_STRICT is
available in all versions of PHP 5 so this doesn't cause any problems).
See also FS#2427.
Diffstat (limited to 'inc/init.php')
-rw-r--r-- | inc/init.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/init.php b/inc/init.php index b3acf2e33..14660b8d0 100644 --- a/inc/init.php +++ b/inc/init.php @@ -30,8 +30,8 @@ if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) { define('DOKU_E_LEVEL', E_ALL); } if (!defined('DOKU_E_LEVEL')) { - if(defined('E_DEPRECATED')){ // since php 5.3 - error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); + if(defined('E_DEPRECATED')){ // since php 5.3, since php 5.4 E_STRICT is part of E_ALL + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT); }else{ error_reporting(E_ALL ^ E_NOTICE); } |