Changeset 10421 for branches/2.7/wp-settings.php

Timestamp:

01/23/2009 06:05:48 PM (16 years ago)

Author:

westi

Message:

Sort out the error_reporting for PHP 5.3. See #8701 for 2.7.x.

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' ) )
-        error_reporting(E_ALL ^ E_STRICT ^ E_DEPRECATED ^ E_NOTICE ^ E_USER_NOTICE);
-    else if ( defined( 'E_STRICT' ) )
+    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);
     else