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
This commit is contained in:
parent
4e09dfc8fb
commit
1cdd5ad41a
|
@ -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);
|
||||
}
|
||||
|
||||
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
|
||||
|
|
|
@ -82,11 +82,7 @@ if ( isset($_GET['action']) ) {
|
|||
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);
|
||||
|
||||
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
|
||||
include(WP_PLUGIN_DIR . '/' . $plugin);
|
||||
}
|
||||
|
|
|
@ -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 );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue