Index: load.php
===================================================================
--- load.php	(revision 15382)
+++ load.php	(working copy)
@@ -256,7 +256,9 @@
  */
 function wp_debug_mode() {
 	if ( WP_DEBUG ) {
-		if ( defined( 'E_DEPRECATED' ) )
+		if ( defined( 'WP_ERROR_REPORTING' ) )
+			error_reporting( WP_ERROR_REPORTING );
+		elseif ( defined( 'E_DEPRECATED' ) )
 			error_reporting( E_ALL & ~E_DEPRECATED & ~E_STRICT );
 		else
 			error_reporting( E_ALL );
@@ -269,7 +271,9 @@
 			ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
 		}
 	} else {
-		if ( defined( 'E_RECOVERABLE_ERROR' ) )
+		if ( defined( 'WP_ERROR_REPORTING' ) )
+			error_reporting( WP_ERROR_REPORTING );
+		elseif ( defined( 'E_RECOVERABLE_ERROR' ) )
 			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 		else
 			error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING );