WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert MS related stuff in plugins.php from [15491] 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-08-11 23:49:30 +00:00
parent 020ce73746
commit 0c3a38fc6c
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/plugins.php
View File

@ -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' ); require_once( ABSPATH . 'wp-admin/includes/default-list-tables.php' );
$table = new WP_Plugins_Table; $table = new WP_Plugins_Table;
@ -330,6 +321,7 @@ $parent_file = 'plugins.php';
require_once(ABSPATH . 'wp-admin/admin-header.php'); require_once(ABSPATH . 'wp-admin/admin-header.php');
$invalid = validate_active_plugins();
if ( !empty($invalid) ) if ( !empty($invalid) )
foreach ( $invalid as $plugin_file => $error ) 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>'; 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>';