From 9879c27093d9514c63c872f82186bfa78e1ef079 Mon Sep 17 00:00:00 2001 From: Peter Westwood Date: Thu, 24 Jun 2010 19:47:44 +0000 Subject: [PATCH] Fix notice when visiting the plugins page as a site admin with multisite enabled. Fixes #14010. git-svn-id: https://develop.svn.wordpress.org/trunk@15323 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/plugins.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index bed5d5f6df..23a7bdfcf3 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -10,11 +10,13 @@ require_once('./admin.php'); if ( is_multisite() ) { $menu_perms = get_site_option( 'menu_items', array() ); - - if ( empty($menu_perms['plugins']) && ! is_super_admin() ) - wp_die( __( 'Cheatin’ uh?' ) ); - else if ( $menu_perms['plugins'] != 1 && is_super_admin() ) - add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' ); + + if ( empty($menu_perms['plugins'] ) || $menu_perms['plugins'] != 1 ) { + if ( ! is_super_admin() ) + wp_die( __( 'Cheatin’ uh?' ) ); + else + add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' ); + } } if ( ! current_user_can( 'activate_plugins' ) )