Ticket #16920: 16920.E_RECOVERABLE_ERROR.diff

wp-admin/plugins.php

@@ -137 +137 @@
                                 wp_die($valid);
 
                         if ( ! WP_DEBUG ) {
-                                if ( 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);
+                                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 );
                         }
 
                         @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.

wp-admin/update.php

@@ -82 +82 @@
                 if ( isset($_GET['failure']) ){
                         echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
 
-                        if ( 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);
-
+                        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 );
                         @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
                         include(WP_PLUGIN_DIR . '/' . $plugin);
                 }

wp-includes/load.php

@@ -271 +271 @@
                         ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
                 }
         } else {
-                if ( 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 );
+                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 );
         }
 }