Permalink
Browse files

Don't deactivate a plugin that is both network activated and activate…

…d on the main site after editing. Props SergeyBiryukov. fixes #16011

git-svn-id: http://svn.automattic.com/wordpress/trunk@17183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 4fd6561 commit ade413d0980f43b9bb34952a9bcdd83d01e8c2e7 ryan committed Dec 30, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 wp-admin/plugin-editor.php
@@ -89,7 +89,7 @@
if ( is_wp_error($error) )
wp_die( $error );
- if ( ! is_plugin_active($file) )
+ if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );

0 comments on commit ade413d

Please sign in to comment.