From f7ba3fd70df35c86e343282d2b712ea7a9abe027 Mon Sep 17 00:00:00 2001 From: scribu Date: Wed, 27 Oct 2010 23:54:43 +0000 Subject: [PATCH] Prevent double inclusion of plugin when already activated on main site. See #14435 git-svn-id: http://svn.automattic.com/wordpress/trunk@16027 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index aab6b46db7..c7f01614d5 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -483,7 +483,7 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen 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 ob_start(); - include(WP_PLUGIN_DIR . '/' . $plugin); + include_once(WP_PLUGIN_DIR . '/' . $plugin); if ( ! $silent ) { do_action( 'activate_plugin', $plugin, $network_wide );