Changeset 14348 for trunk/wp-admin/plugin-editor.php

Timestamp:

05/02/2010 10:57:44 PM (16 years ago)

Author:

nacin

Message:

Support network-wide plugin re-activation in upgrades and edits. props PeteMall, fixes #13216

File:

• trunk/wp-admin/plugin-editor.php (modified) (3 diffs)

trunk/wp-admin/plugin-editor.php

@@ -56 +56 @@
         fclose($f);
 
+        $network_wide = is_plugin_active_for_network( $file );
+
         // Deactivate so we can test it.
         if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
@@ -63 +65 @@
             update_option('recently_activated', array($file => time()) + (array)get_option('recently_activated'));
 
-            wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto"));
+            wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
             exit;
         }
@@ -84 +86 @@
 
         if ( ! is_plugin_active($file) )
-            activate_plugin($file, "plugin-editor.php?file=$file&phperror=1"); // we'll override this later if the plugin can be included without fatal error
+            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("plugin-editor.php?file=$file&a=te&scrollto=$scrollto");