WordPress.org

Make WordPress Core

Ticket #12395: 12395_2.9.diff

File 12395_2.9.diff, 3.5 KB (added by eddieringle, 5 years ago)

2.9 backport of 12395.3.diff

  • wp-load.php

     
    2020define( 'ABSPATH', dirname(__FILE__) . '/' ); 
    2121 
    2222if ( defined('E_RECOVERABLE_ERROR') ) 
    23         error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); 
     23        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); 
    2424else 
    25         error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
     25        error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
    2626 
    2727if ( file_exists( ABSPATH . 'wp-config.php') ) { 
    2828 
  • wp-settings.php

     
    218218} else { 
    219219        define('WP_DEBUG', false); 
    220220        if ( defined('E_RECOVERABLE_ERROR') ) 
    221                 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); 
     221                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); 
    222222        else 
    223                 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
     223                error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
    224224} 
    225225 
    226226// For an advanced caching plugin to use, static because you would only want one 
     
    229229 
    230230/** 
    231231 * Private 
    232  */  
     232 */ 
    233233if ( !defined('MEDIA_TRASH') ) 
    234234        define('MEDIA_TRASH', false); 
    235235 
  • wp-admin/update.php

     
    5454                        echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>'; 
    5555 
    5656                        if ( defined('E_RECOVERABLE_ERROR') ) 
    57                                 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); 
     57                                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); 
    5858                        else 
    59                                 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
     59                                error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
    6060 
    6161                        @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. 
    6262                        include(WP_PLUGIN_DIR . '/' . $plugin); 
  • wp-admin/plugins.php

     
    9494                                wp_die($valid); 
    9595 
    9696                        if ( defined('E_RECOVERABLE_ERROR') ) 
    97                                 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); 
     97                                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); 
    9898                        else 
    99                                 error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
     99                                error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 
    100100 
    101101                        @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. 
    102102                        include(WP_PLUGIN_DIR . '/' . $plugin);