Ticket #13585: 13585.diff

wp-admin/includes/plugin.php

@@ -482 +482 @@
                         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();
                 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) );
                 if ( $network_wide ) {
                         $current[$plugin] = time();
@@ -497 +493 @@
                 }
                 do_action( 'activate_' . trim( $plugin ) );
                 do_action( 'activated_plugin', trim( $plugin) );
+                if ( ob_get_length() > 0 ) {
+                        $output = ob_get_clean();
+                        return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
+                }
                 ob_end_clean();
         }
 

wp-admin/plugins.php

@@ -334 +334 @@
 
 <?php if ( isset($_GET['error']) ) :
 
-        if (isset($_GET['charsout']))
-                $errmsg = sprintf(__('Plugin could not be activated because it generated %d characters of <strong>unexpected output</strong>.'), $_GET['charsout']);
+        if ( isset($_GET['charsout']) )
+                $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation.  If &#8220;headers already sent&#8221; or other strange errors start occurring, try deactivating or removing this plugin.'), $_GET['charsout']);
         else
                 $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');