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

Multisite: Don't set the $super_admins global in grant_super_admin(), revoke_super_admin(). 

Adds tests and docs.

props jdgrimes.
see #27205.

Built from https://develop.svn.wordpress.org/trunk@27706


git-svn-id: http://core.svn.wordpress.org/trunk@27545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-03-25 12:14:14 +00:00
parent 6dd40a18d4
commit 156a5a234f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/ms.php
View File

@ -686,13 +686,14 @@ function choose_primary_blog() {
* *
* @since 3.0.0 * @since 3.0.0
* @param int $user_id ID of the user to be granted Super Admin privileges. * @param int $user_id ID of the user to be granted Super Admin privileges.
* @return bool True on success, false on failure. This can fail when the user is
* already a super admin or when the $super_admins global is defined.
*/ */
function grant_super_admin( $user_id ) { function grant_super_admin( $user_id ) {
global $super_admins;
// If global super_admins override is defined, there is nothing to do here. // If global super_admins override is defined, there is nothing to do here.
if ( isset( $super_admins ) ) if ( isset( $GLOBALS['super_admins'] ) ) {
return false; return false;
}
/** /**
* Fires before the user is granted Super Admin privileges. * Fires before the user is granted Super Admin privileges.
@ -729,13 +730,14 @@ function grant_super_admin( $user_id ) {
* *
* @since 3.0.0 * @since 3.0.0
* @param int $user_id ID of the user Super Admin privileges to be revoked from. * @param int $user_id ID of the user Super Admin privileges to be revoked from.
* @return bool True on success, false on failure. This can fail when the user's email
* is the network admin email or when the $super_admins global is defined.
*/ */
function revoke_super_admin( $user_id ) { function revoke_super_admin( $user_id ) {
global $super_admins;
// If global super_admins override is defined, there is nothing to do here. // If global super_admins override is defined, there is nothing to do here.
if ( isset( $super_admins ) ) if ( isset( $GLOBALS['super_admins'] ) ) {
return false; return false;
}
/** /**
* Fires before the user's Super Admin privileges are revoked. * Fires before the user's Super Admin privileges are revoked.