Changeset 15017 for trunk/wp-admin/includes/plugin.php

Timestamp:

05/28/2010 12:18:00 AM (16 years ago)

Author:

ryan

Message:

Allow plugin activation even if plugin generates extra output. Make warning more informative. fixes #13585

File:

• trunk/wp-admin/includes/plugin.php (modified) (2 diffs)

trunk/wp-admin/includes/plugin.php

@@ -483 +483 @@
                 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 ) {
@@ -498 +494 @@
                 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();
         }