Changeset 18169

Timestamp:

06/06/2011 04:59:24 PM (15 years ago)

Author:

ryan

Message:

Fix warnings in menu.php when plugins.php is enabled for non-supes. Props PeteMall. fixes #17702

File:

• trunk/wp-admin/menu.php (modified) (1 diff)

trunk/wp-admin/menu.php

@@ -175 +175 @@
 }
 
-$menu_perms = get_site_option('menu_items', array());
+$menu_perms = get_site_option( 'menu_items', array() );
 if ( ! is_multisite() || is_super_admin() || ! empty( $menu_perms['plugins'] ) ) {
-    $count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>";
-    if ( is_multisite() || ! current_user_can( 'update_plugins' ) )
-        $count = '';
+    $count = '';
+    if ( ! is_multisite() && current_user_can( 'update_plugins' ) )
+        $count = "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>";
+
     $menu[65] = array( sprintf( __('Plugins %s'), $count ), 'activate_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div' );