From ebdc0d02b6045091b4df18785957fb538201dc61 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 6 Jun 2011 16:59:24 +0000
Subject: [PATCH] Fix warnings in menu.php when plugins.php is enabled for
 non-supes.  Props PeteMall. fixes #17702

git-svn-id: http://svn.automattic.com/wordpress/trunk@18169 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/menu.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index f2194adcc..cbd18d738 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -174,11 +174,12 @@ function _add_themes_utility_last() {
 	add_submenu_page('themes.php', _x('Editor', 'theme editor'), _x('Editor', 'theme editor'), 'edit_themes', 'theme-editor.php');
 }
 
-$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' );
 	
 	$submenu['plugins.php'][5]  = array( __('Installed Plugins'), 'activate_plugins', 'plugins.php' );