golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert [14011]. Add some actions. fixes #12109, see #12460. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14040 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-08 04:15:58 +00:00
parent 53e0be05cb
commit 559a6e0855
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -809,10 +809,7 @@ function _admin_notice_multisite_activate_plugins_page() {
* @param $user_id
*/
function grant_super_admin( $user_id ) {
global $current_user;
if ( $current_user->ID == $user_id || !current_user_can( 'manage_network_options' ) )
return;
do_action( 'grant_super_admin', $user_id );
$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
@ -820,6 +817,7 @@ function grant_super_admin( $user_id ) {
if ( ! in_array( $user->user_login, $super_admins ) ) {
$super_admins[] = $user->user_login;
update_site_option( 'site_admins' , $super_admins );
do_action( 'granted_super_admin', $user_id );
}
}
@ -830,22 +828,16 @@ function grant_super_admin( $user_id ) {
* @param $user_id
*/
function revoke_super_admin( $user_id ) {
global $current_user;
if ( $current_user->ID == $user_id || !current_user_can( 'manage_network_options' ) )
return;
$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
if ( count( $super_admins ) < 2 )
return;
do_action( 'revoke_super_admin', $user_id );
$admin_email = get_site_option( 'admin_email' );
$user = new WP_User( $user_id );
if ( $user->ID != $current_user->ID || $user->user_email != $admin_email ) {
if ( $user->user_email != $admin_email ) {
foreach ( $super_admins as $key => $username ) {
if ( $username == $user->user_login ) {
unset( $super_admins[$key] );
do_action( 'revoked_super_admin', $user_id );
break;
}
}