From 712aeeae45872064146b8a45803ee0252b5f3944 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Tue, 7 Dec 2010 18:10:16 +0000 Subject: [PATCH] Don't show super admin checkbox for the user that has the network admin email address. Props duck_. fixes #14051 git-svn-id: https://develop.svn.wordpress.org/trunk@16767 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/user-edit.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index c952d4d96a..0e296d5aba 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -141,7 +141,7 @@ if ( !is_multisite() ) { if ( $delete_role ) // stops users being added to current blog when they are edited delete_user_meta( $user_id, $blog_prefix . 'capabilities' ); - if ( is_multisite() && is_network_admin() & !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) + if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id ); } @@ -229,7 +229,7 @@ do_action('personal_options', $profileuser); - + + +if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?> -

- +user_email != get_site_option( 'admin_email' ) ) : ?> +

+ +

+ +