From 655340ec0439a17eb19f235b62ef70852248b3ba Mon Sep 17 00:00:00 2001
From: scribu <scribu@git.wordpress.org>
Date: Wed, 11 Aug 2010 23:49:30 +0000
Subject: [PATCH] Revert MS related stuff in plugins.php from [15491]

git-svn-id: https://develop.svn.wordpress.org/trunk@15492 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/plugins.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 66685a41d2..34e48d4a3a 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -299,15 +299,6 @@ if ( !empty($action) ) {
 	}
 }
 
-if ( is_multisite() && is_super_admin() ) {
-	$menu_perms = get_site_option('menu_items', array());
-	if ( empty($menu_perms['plugins']) )
-		add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' );
-	unset($menu_perms);
-}
-
-$invalid = validate_active_plugins();
-
 require_once( ABSPATH . 'wp-admin/includes/default-list-tables.php' );
 
 $table = new WP_Plugins_Table;
@@ -330,6 +321,7 @@ $parent_file = 'plugins.php';
 
 require_once(ABSPATH . 'wp-admin/admin-header.php');
 
+$invalid = validate_active_plugins();
 if ( !empty($invalid) )
 	foreach ( $invalid as $plugin_file => $error )
 		echo '<div id="message" class="error"><p>' . sprintf(__('The plugin <code>%s</code> has been <strong>deactivated</strong> due to an error: %s'), esc_html($plugin_file), $error->get_error_message()) . '</p></div>';