Changeset 21741

Timestamp:

09/04/2012 08:53:05 PM (14 years ago)

Author:

nacin

Message:

Only allow operations on network plugins through the network admin. fixes #21187. merges [21700] and [21740] to the 3.4 branch.

Location:

branches/3.4/wp-admin

Files:

• includes/class-wp-plugins-list-table.php (modified) (1 diff)
• plugins.php (modified) (2 diffs)

branches/3.4/wp-admin/includes/class-wp-plugins-list-table.php

@@ -91 +91 @@
                 foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
                         // Filter into individual sections
-                        if ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
+                        if ( is_multisite() && ! $screen->is_network && is_network_only_plugin( $plugin_file ) ) {
+                                unset( $plugins['all'][ $plugin_file ] );
+                        } elseif ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
                                 unset( $plugins['all'][ $plugin_file ] );
                         } elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )

branches/3.4/wp-admin/plugins.php

@@ -52 +52 @@
 
                         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 ] );
@@ -73 +78 @@
 
                         // 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) ) {