From ade413d0980f43b9bb34952a9bcdd83d01e8c2e7 Mon Sep 17 00:00:00 2001 From: ryan Date: Thu, 30 Dec 2010 19:02:14 +0000 Subject: [PATCH] Don't deactivate a plugin that is both network activated and activated 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 --- wp-admin/plugin-editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php index 5480a99b3..7efcecd39 100644 --- a/wp-admin/plugin-editor.php +++ b/wp-admin/plugin-editor.php @@ -89,7 +89,7 @@ default: 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") );