Changeset 14348 for trunk/wp-admin/includes/class-wp-upgrader.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/includes/class-wp-upgrader.php (modified) (3 diffs)

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>';
                 }