WordPress.org

Make WordPress Core

Changeset 17632


Ignore:
Timestamp:
04/12/2011 09:21:13 AM (7 years ago)
Author:
nacin
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/plugins.php

    r17322 r17632  
    138138
    139139            if ( ! WP_DEBUG ) {
    140                 if ( defined('E_RECOVERABLE_ERROR') )
    141                     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);
    142                 else
    143                     error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
     140                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 );
    144141            }
    145142
  • trunk/wp-admin/update.php

    r16860 r17632  
    8383            echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
    8484
    85             if ( defined('E_RECOVERABLE_ERROR') )
    86                 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);
    87             else
    88                 error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
    89 
     85            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 );
    9086            @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
    9187            include(WP_PLUGIN_DIR . '/' . $plugin);
  • trunk/wp-includes/load.php

    r17613 r17632  
    272272        }
    273273    } else {
    274         if ( defined( 'E_RECOVERABLE_ERROR' ) )
    275             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 );
    276         else
    277             error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING );
     274        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 );
    278275    }
    279276}
Note: See TracChangeset for help on using the changeset viewer.