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

Detect plugin output on activation, as well as fatal errors. props miqrogroove. fixes #12089 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-02-16 03:44:20 +00:00
parent 0744c77fbf
commit 082eca5c48
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/plugin.php
View File

@ -358,7 +358,11 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false) {
if ( !empty($redirect) ) if ( !empty($redirect) )
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
ob_start(); ob_start();
@include(WP_PLUGIN_DIR . '/' . $plugin); include(WP_PLUGIN_DIR . '/' . $plugin);
if ( ob_get_length() > 0 ) {
$output = ob_get_clean();
return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
}
do_action( 'activate_plugin', trim( $plugin) ); do_action( 'activate_plugin', trim( $plugin) );
if ( $network_wide ) { if ( $network_wide ) {
$current[$plugin] = time(); $current[$plugin] = time();

37
wp-admin/plugins.php
View File

@ -50,8 +50,15 @@ if ( !empty($action) ) {
check_admin_referer('activate-plugin_' . $plugin); check_admin_referer('activate-plugin_' . $plugin);
$result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin, $network_wide); $result = activate_plugin($plugin, 'plugins.php?error=true&plugin=' . $plugin, $network_wide);
if ( is_wp_error( $result ) ) if ( is_wp_error( $result ) ) {
wp_die($result); if ('unexpected_output' == $result->get_error_code()) {
$redirect = 'plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin;
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
exit;
} else {
wp_die($result);
}
}
$recent = (array)get_option('recently_activated'); $recent = (array)get_option('recently_activated');
if ( isset($recent[ $plugin ]) ) { if ( isset($recent[ $plugin ]) ) {
@ -140,10 +147,12 @@ if ( !empty($action) ) {
if ( is_wp_error($valid) ) if ( is_wp_error($valid) )
wp_die($valid); wp_die($valid);
if ( defined('E_RECOVERABLE_ERROR') ) if ( ! WP_DEBUG ) {
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR); if ( defined('E_RECOVERABLE_ERROR') )
else error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
error_reporting(E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING); 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);
@ -157,7 +166,10 @@ if ( !empty($action) ) {
check_admin_referer('deactivate-plugin_' . $plugin); check_admin_referer('deactivate-plugin_' . $plugin);
deactivate_plugins($plugin); deactivate_plugins($plugin);
update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated')); update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated'));
wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page"); if (headers_sent())
echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page" ) . "' />";
else
wp_redirect("plugins.php?deactivate=true&plugin_status=$status&paged=$page");
exit; exit;
break; break;
case 'deactivate-selected': case 'deactivate-selected':
@ -302,8 +314,15 @@ if ( !empty($invalid) )
echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '</p></div>'; echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '</p></div>';
?> ?>
<?php if ( isset($_GET['error']) ) : ?> <?php if ( isset($_GET['error']) ) :
<div id="message" class="updated"><p><?php _e('Plugin could not be activated because it triggered a <strong>fatal error</strong>.') ?></p>
if (isset($_GET['charsout']))
$errmsg = sprintf(__('Plugin could not be activated because it generated %d characters of <strong>unexpected output</strong>.'), $_GET['charsout']);
else
$errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
?>
<div id="message" class="updated"><p><?php echo $errmsg; ?></p>
<?php <?php
if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?> if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $plugin) ) { ?>
<iframe style="border:0" width="100%" height="70px" src="<?php echo admin_url('plugins.php?action=error_scrape&amp;plugin=' . esc_attr($plugin) . '&amp;_wpnonce=' . esc_attr($_GET['_error_nonce'])); ?>"></iframe> <iframe style="border:0" width="100%" height="70px" src="<?php echo admin_url('plugins.php?action=error_scrape&amp;plugin=' . esc_attr($plugin) . '&amp;_wpnonce=' . esc_attr($_GET['_error_nonce'])); ?>"></iframe>