Changeset 14040

Timestamp:

04/08/2010 04:15:58 AM (15 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-admin/includes/ms.php (modified) (3 diffs)

trunk/wp-admin/includes/ms.php

@@ -810 +810 @@
  */
 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' ) );
@@ -821 +818 @@
         $super_admins[] = $user->user_login;
         update_site_option( 'site_admins' , $super_admins );
+        do_action( 'granted_super_admin', $user_id );
     }
 }
@@ -831 +829 @@
  */
 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;
             }