Changeset 17632

Timestamp:

04/12/2011 09:21:13 AM (15 years ago)

Author:

nacin

Message:

Remove more E_RECOVERABLE_ERROR checks. props duck_, see #16920.

Location:

trunk

Files:

• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/update.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)

trunk/wp-admin/plugins.php

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

trunk/wp-admin/update.php

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

trunk/wp-includes/load.php

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