← Back to branch summary

~canonical-sysadmins/wordpress/3.9.x

« back to all changes in this revision

Viewing changes to wp-admin/update.php

  • Committer: Chris Jones
  • Date: 2010-01-19 13:17:33 UTC
  • Revision ID: cmsj@tenshu.net-20100119131733-rf31jv9k1v0xzo2h
[CJ] Import wordpress 2.9.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/update.php
52
52
 
53
53
                if( isset($_GET['failure']) ){
54
54
                        echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
55
 
                        error_reporting( E_ALL ^ E_NOTICE );
 
55
 
 
56
                        if ( defined('E_RECOVERABLE_ERROR') )
 
57
                                error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 
58
                        else
 
59
                                error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
 
60
 
56
61
                        @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
57
62
                        include(WP_PLUGIN_DIR . '/' . $plugin);
58
63
                }