Changeset 21740 for trunk/wp-admin/plugins.php

Timestamp:

09/04/2012 08:51:33 PM (12 years ago)

Author:

nacin

Message:

Only allow operations on network plugins through the network admin. see #21187, for trunk.

File:

• trunk/wp-admin/plugins.php (modified) (2 diffs)

trunk/wp-admin/plugins.php

@@ -45 +45 @@
 
             if ( ! is_network_admin() ) {
+                if ( is_network_only_plugin( $plugin ) ) {
+                    wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") );
+                    exit;
+                }
+
                 $recent = (array) get_option( 'recently_activated' );
                 unset( $recent[ $plugin ] );
@@ -66 +71 @@
 
             // Only activate plugins which are not already active.
-            $check = is_network_admin() ? 'is_plugin_active_for_network' : 'is_plugin_active';
-            foreach ( $plugins as $i => $plugin )
-                if ( $check( $plugin ) )
-                    unset( $plugins[ $i ] );
+            if ( is_network_admin() ) {
+                foreach ( $plugins as $i => $plugin ) {
+                    if ( is_plugin_active_for_network( $plugin ) )
+                        unset( $plugins[ $i ] );
+                }
+            } else {
+                foreach ( $plugins as $i => $plugin ) {
+                    if ( is_plugin_active( $plugin ) || is_network_only_plugin( $plugin ) )
+                        unset( $plugins[ $i ] );
+                }
+            }
 
             if ( empty($plugins) ) {