Changeset 10432

Timestamp:

01/24/2009 01:03:38 PM (18 years ago)

Author:

westi

Message:

Error reporting (again). For 2.7.x, See #8701 props jacobsantos.

File:

• branches/2.7/wp-settings.php (modified) (1 diff)

branches/2.7/wp-settings.php

@@ -202 +202 @@
         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);