Changeset 11128

Timestamp:

04/29/2009 08:18:44 PM (16 years ago)

Author:

ryan

Message:

Error reporting fixes. Props Denis-de-Bernardy, jacobsantos. fixes #9639 #8701

Location:

trunk

Files:

• wp-load.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-load.php

@@ -20 +20 @@
 define( 'ABSPATH', dirname(__FILE__) . '/' );
 
-error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
+if ( defined('E_RECOVERABLE_ERROR') )
+    error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
+else
+    error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
 
 if ( file_exists( ABSPATH . 'wp-config.php') ) {

trunk/wp-settings.php

@@ -202 +202 @@
     error_reporting(E_ALL);
 } else {
-    // Unicode Extension is in PHP 6.0 only or do version check when this changes.
-    if ( function_exists('unicode_decode') )
-        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 );
+    if ( defined('E_RECOVERABLE_ERROR') )
+        error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
     else
-        error_reporting(E_ALL ^ E_NOTICE ^ E_USER_NOTICE);
+        error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
 }