From 56b53ff30f8cbc442b65c294f49fe07219fd1a48 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 2 Aug 2010 17:25:54 +0000
Subject: [PATCH] Remove 'plugins page is not visible to normal users' notice.
 We're just not that into you.

git-svn-id: http://svn.automattic.com/wordpress/trunk@15485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/ms.php | 11 -----------
 wp-admin/plugins.php     |  2 --
 2 files changed, 13 deletions(-)

diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index 22a7253510..e85e2de68c 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -824,17 +824,6 @@ function ms_deprecated_blogs_file() {
 }
 add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
 
-/**
- * Outputs the notice message for multisite regarding activation of plugin page.
- *
- * @since 3.0.0
- * @return none
- */
-function _admin_notice_multisite_activate_plugins_page() {
-	$message = sprintf( __( 'The plugins page is not visible to normal users. It must be activated first. %s' ), '<a href="' . esc_url( admin_url( 'ms-options.php#menu' ) ) . '">' . __( 'Activate' ) . '</a>' );
-	echo "<div class='error'><p>$message</p></div>";
-}
-
 /**
  * Grants super admin privileges.
  *
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index df220c9dda..97125d74aa 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -14,8 +14,6 @@ if ( is_multisite() ) {
 	if ( empty( $menu_perms['plugins'] ) ) { 
 		if ( ! is_super_admin() )
 			wp_die( __( 'Cheatin&#8217; uh?' ) );
-		else
-			add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' );
 	}
 }