From 1cdd5ad41ab1ac55ed0b95ee64a78021df881915 Mon Sep 17 00:00:00 2001 From: nacin Date: Tue, 12 Apr 2011 09:21:13 +0000 Subject: [PATCH] Remove more E_RECOVERABLE_ERROR checks. props duck_, see #16920. git-svn-id: http://svn.automattic.com/wordpress/trunk@17632 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/plugins.php | 5 +---- wp-admin/update.php | 6 +----- wp-includes/load.php | 5 +---- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 0c36bbd10..8142b8919 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -137,10 +137,7 @@ if ( $action ) { 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. diff --git a/wp-admin/update.php b/wp-admin/update.php index 8dd8a89bb..e529064ee 100644 --- a/wp-admin/update.php +++ b/wp-admin/update.php @@ -82,11 +82,7 @@ if ( isset($_GET['action']) ) { if ( isset($_GET['failure']) ){ echo '

' . __('Plugin failed to reactivate due to a fatal error.') . '

'; - 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); } diff --git a/wp-includes/load.php b/wp-includes/load.php index 1a4654165..47167b351 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -271,10 +271,7 @@ function wp_debug_mode() { 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 ); } }