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

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
This commit is contained in:
scribu 2010-10-27 23:54:43 +00:00
parent 4466ea9887
commit f7ba3fd70d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -483,7 +483,7 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
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_once(WP_PLUGIN_DIR . '/' . $plugin);
if ( ! $silent ) { if ( ! $silent ) {
do_action( 'activate_plugin', $plugin, $network_wide ); do_action( 'activate_plugin', $plugin, $network_wide );