use activate_plugin for error scraping, pass full WP_Error object to wp_die(), whitespace cleanups. Props DD32. fixes #7671
git-svn-id: http://svn.automattic.com/wordpress/trunk@9315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
b5b92a3968
commit
58d9c20de5
|
@ -28,7 +28,7 @@ if( !empty($action) ) {
|
|||
check_admin_referer('activate-plugin_' . $plugin);
|
||||
$result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin);
|
||||
if ( is_wp_error( $result ) )
|
||||
wp_die( $result->get_error_message() );
|
||||
wp_die($result);
|
||||
$recent = (array)get_option('recently_activated');
|
||||
if ( isset($recent[ $plugin ]) ) {
|
||||
unset($recent[ $plugin ]);
|
||||
|
@ -59,7 +59,9 @@ if( !empty($action) ) {
|
|||
wp_die($valid);
|
||||
error_reporting( E_ALL ^ E_NOTICE );
|
||||
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
|
||||
include(WP_PLUGIN_DIR . '/' . $plugin);
|
||||
$result = activate_plugin($plugin, false);
|
||||
if ( is_wp_error( $result ) )
|
||||
wp_die($result);
|
||||
exit;
|
||||
break;
|
||||
case 'deactivate':
|
||||
|
|
Loading…
Reference in New Issue