Changeset 21198 for trunk/wp-admin/menu.php

Timestamp:

06/30/2012 12:40:25 PM (13 years ago)

Author:

nacin

Message:

Enforce multisite plugins menu preference in map_meta_cap(). This means a simple current_user_can('activate_plugins') check will handle the 'Enable administration menus' setting.

Remove bogus checks for enabling/disabling the 'themes' menu (something core does not handle out of the box) when in the network admin.

fixes #21123.

File:

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

trunk/wp-admin/menu.php

@@ -143 +143 @@
 }
 
-$menu_perms = get_site_option( 'menu_items', array() );
-if ( ! is_multisite() || is_super_admin() || ! empty( $menu_perms['plugins'] ) ) {
-    if ( ! isset( $update_data ) )
-        $update_data = wp_get_update_data();
-
     $count = '';
-    if ( ! is_multisite() && current_user_can( 'update_plugins' ) )
+    if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
+        if ( ! isset( $update_data ) )
+            $update_data = wp_get_update_data();
         $count = "<span class='update-plugins count-{$update_data['counts']['plugins']}'><span class='plugin-count'>" . number_format_i18n($update_data['counts']['plugins']) . "</span></span>";
+    }
 
     $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );
@@ -161 +159 @@
             $submenu['plugins.php'][15] = array( _x('Editor', 'plugin editor'), 'edit_plugins', 'plugin-editor.php' );
         }
-}
-unset($menu_perms, $update_data);
+
+unset( $update_data );
 
 if ( current_user_can('list_users') )