Changeset 12974

Timestamp:

02/05/2010 06:10:30 PM (15 years ago)

Author:

ryan

Message:

Network plugin activation cleanup. Props nacin. see #12139

Location:

trunk/wp-admin

Files:

• includes/plugin.php (modified) (2 diffs)
• plugins.php (modified) (1 diff)

trunk/wp-admin/includes/plugin.php

@@ -396 +396 @@
             // Deactivate network wide
             $do_network = true;
-            unset($network_current[$plugin]);
+            unset( $network_current[ $plugin ] );
         } else {
             // Deactivate for this blog only
-            $do_blog = true;
             $key = array_search( $plugin, (array) $current );
-
-            if ( false !== $key )
+            if ( false !== $key ) {
+                $do_blog = true;
                 array_splice( $current, $key, 1 );
+            }
         }
 
@@ -563 +563 @@
     if ( is_multisite() && is_super_admin() ) {
         $network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-        $plugins = array_merge( $plugins, $network_plugins );
+        $plugins = array_merge( $plugins, array_keys( $network_plugins ) );
     }
 

trunk/wp-admin/plugins.php

@@ -478 +478 @@
     foreach ( (array)$plugins as $plugin_file => $plugin_data) {
         $actions = array();
-        $is_active = is_plugin_active($plugin_file);
         $is_active_for_network = is_plugin_active_for_network($plugin_file);
+        $is_active = $is_active_for_network || is_plugin_active( $plugin_file );
 
         if ( $is_active_for_network && !is_super_admin() )