Changeset 13235

Timestamp:

02/19/2010 09:53:24 PM (12 years ago)

Author:

nacin

Message:

Full Multisite support for dropins/mu-plugins in admin area. Ensure that network, drop-ins and mu-plugins are only shown and counted to super admins. See #11644, #11861

File:

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

trunk/wp-admin/plugins.php

@@ -366 +366 @@
 $upgrade_plugins = array();
 $network_plugins = array();
-$mustuse_plugins = get_mu_plugins();
-$dropins_plugins = get_dropins();
+$mustuse_plugins = ( is_multisite() && is_super_admin() ) || ! is_multisite() ? get_mu_plugins() : array();
+$dropins_plugins = ( is_multisite() && is_super_admin() ) || ! is_multisite() ? get_dropins() : array();
 
 set_transient( 'plugin_slugs', array_keys($all_plugins), 86400 );
@@ -390 +390 @@
 foreach ( (array) $all_plugins as $plugin_file => $plugin_data) {
     // Filter into individual sections
-    if ( is_plugin_active_for_network($plugin_file) && is_super_admin() ) {
-        $network_plugins[ $plugin_file ] = $plugin_data;
+    if ( is_plugin_active_for_network($plugin_file) ) {
+        if ( is_super_admin() )
+            $network_plugins[ $plugin_file ] = $plugin_data;
     } elseif ( is_plugin_active($plugin_file) ) {
         $active_plugins[ $plugin_file ] = $plugin_data;
@@ -400 +401 @@
     }
 
-    if ( isset( $current->response[ $plugin_file ] ) )
-        $upgrade_plugins[ $plugin_file ] = $plugin_data;
+    if ( isset( $current->response[ $plugin_file ] ) )
+        $upgrade_plugins[ $plugin_file ] = $plugin_data;
 }
 
@@ -539 +540 @@
                 }
             } else {
-                $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
+                if ( is_multisite() && is_network_only_plugin( $plugin_file ) )
+                    $actions[] = '<span title="' . __('This plugin can only be activated for all sites in a network') . '">' . __('Network Only') . '</span>';
+                else
+                    $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
                 if ( is_multisite() && is_super_admin() )
                     $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
-            }
-
-            if ( is_multisite() && is_network_only_plugin( $plugin_file ) )
-                $actions[] = '<span title="' . __('This plugin can only be activated for all sites in a network') . '">' . __('Network Only') . '</span>';
-            else
-                $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';
-            if ( is_multisite() && is_super_admin() )
-                $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
-
-            if ( !is_multisite() && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
-                $actions[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
-
-            if ( ! $is_active && current_user_can('delete_plugins') )
-                $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
-
+    
+                if ( !is_multisite() && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
+                    $actions[] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . __('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
+    
+                if ( ! $is_active && current_user_can('delete_plugins') )
+                    $actions[] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page, 'bulk-manage-plugins') . '" title="' . __('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
+            }
         }