Make WordPress Core

Changeset 16767


Ignore:
Timestamp:
12/07/2010 06:10:16 PM (14 years ago)
Author:
ryan
Message:

Don't show super admin checkbox for the user that has the network admin email address. Props duck_. fixes #14051

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/user-edit.php

    r16744 r16767  
    142142        delete_user_meta( $user_id, $blog_prefix . 'capabilities' );
    143143
    144     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 ) )
     144    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 ) )
    145145        empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
    146146}
     
    230230    </tr>
    231231
    232 <?php if ( !IS_PROFILE_PAGE && !is_network_admin() ): ?>
     232<?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
    233233<tr><th><label for="role"><?php _e('Role:') ?></label></th>
    234234<td><select name="role" id="role">
     
    250250</select>
    251251<?php endif; //!IS_PROFILE_PAGE
    252 if ( is_multisite() && is_network_admin() && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
     252
     253if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
    253254<tr><th><label for="role"><?php _e('Super Admin'); ?></label></th>
    254255<td>
    255 <p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.'); ?></label></p>
     256<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) ) : ?>
     257<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
     258<?php else : ?>
     259<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
     260<?php endif; ?>
     261</td></tr>
    256262<?php } ?>
    257 </td></tr>
    258263
    259264<tr>
Note: See TracChangeset for help on using the changeset viewer.