Changeset 14348

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

Location:

trunk/wp-admin

Files:

• includes/class-wp-upgrader.php (modified) (3 diffs)
• plugin-editor.php (modified) (3 diffs)
• update.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -987 +987 @@
         var $plugin = '';
         var $plugin_active = false;
+        var $plugin_network_active = false;
 
         function Plugin_Upgrader_Skin($args = array()) {
@@ -998 +999 @@
                 $this->plugin = $args['plugin'];
 
-                $this->plugin_active = is_plugin_active($this->plugin);
+                $this->plugin_active = is_plugin_active( $this->plugin );
+                $this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
 
                 parent::__construct($args);
@@ -1007 +1009 @@
                 if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
                         show_message(__('Reactivating the plugin…'));
-                        echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
+                        echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
                 }
 

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");

trunk/wp-admin/update.php

@@ -70 +70 @@
                 if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
                         wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
-                        activate_plugin($plugin);
+                        activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ) );
                         wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
                         die();