From cbe2d8b09c7f284a961aad1723ca93430d663ace Mon Sep 17 00:00:00 2001 From: westi Date: Sat, 24 Jan 2009 13:01:37 +0000 Subject: [PATCH] Error reporting (again\!) See #8701 props jacobsantos. git-svn-id: http://svn.automattic.com/wordpress/trunk@10431 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-settings.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wp-settings.php b/wp-settings.php index f9d694f6e..109a32c2b 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -201,10 +201,11 @@ timer_start(); if (defined('WP_DEBUG') and WP_DEBUG == true) { error_reporting(E_ALL); } else { - if ( defined( 'E_DEPRECATED' ) ) // Introduced in PHP 5.3 - error_reporting( (E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE) & E_STRICT); - else if ( defined( 'E_STRICT' ) ) // Introduced in PHP 5.0 not part of E_ALL - error_reporting( ( E_ALL ^ E_NOTICE ^ E_USER_NOTICE ) & E_STRICT); + // Unicode Extension is in PHP 6.0 only or do version check when this changes. + if ( version_compare( '6.0', phpversion(), '>' ) ) + error_reporting( E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE ^ E_STRICT ); + else if ( defined( 'E_DEPRECATED' ) ) // Introduced in PHP 5.3 + error_reporting( E_ALL ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE ); else error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE); }