WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not stop plugin activation due to E_DEPRECATED errors in php 5.3, props Denis-de-Bernardy, fixes #11250 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-12-12 09:20:07 +00:00
parent a941587c26
commit 2d8cf34e49
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/plugins.php
View File

@ -93,7 +93,11 @@ if ( !empty($action) ) {
if ( is_wp_error($valid) ) if ( is_wp_error($valid) )
wp_die($valid); wp_die($valid);
error_reporting( E_ALL ^ E_NOTICE ); if ( defined('E_RECOVERABLE_ERROR') )
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
else
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed. @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
include(WP_PLUGIN_DIR . '/' . $plugin); include(WP_PLUGIN_DIR . '/' . $plugin);
do_action('activate_' . $plugin); do_action('activate_' . $plugin);

7
wp-admin/update.php
View File

@ -52,7 +52,12 @@ if ( isset($_GET['action']) ) {
if( isset($_GET['failure']) ){ if( isset($_GET['failure']) ){
echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>'; echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
error_reporting( E_ALL ^ E_NOTICE );
if ( defined('E_RECOVERABLE_ERROR') )
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
else
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed. @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
include(WP_PLUGIN_DIR . '/' . $plugin); include(WP_PLUGIN_DIR . '/' . $plugin);
} }