Ticket #21788: 21788.patch

wp-admin/includes/ms.php

@@ -691 +691 @@
 add_action( 'network_admin_notices', 'ms_deprecated_blogs_file' );
 
 /**
- * Grants super admin privileges.
- *
- * @since 3.0.0
- * @param int $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 ( isset($super_admins) )
-                return false;
-
-        do_action( 'grant_super_admin', $user_id );
-
-        // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-
-        $user = get_userdata( $user_id );
-        if ( $user && ! 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 );
-                return true;
-        }
-        return false;
-}
-
-/**
- * Revokes super admin privileges.
- *
- * @since 3.0.0
- * @param int $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 ( isset($super_admins) )
-                return false;
-
-        do_action( 'revoke_super_admin', $user_id );
-
-        // Directly fetch site_admins instead of using get_super_admins()
-        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
-
-        $user = get_userdata( $user_id );
-        if ( $user && $user->user_email != get_site_option( 'admin_email' ) ) {
-                if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
-                        unset( $super_admins[$key] );
-                        update_site_option( 'site_admins', $super_admins );
-                        do_action( 'revoked_super_admin', $user_id );
-                        return true;
-                }
-        }
-        return false;
-}
-
-/**
  * Whether or not we can edit this network from this page
  *
  * By default editing of network is restricted to the Network Admin for that site_id this allows for this to be overridden

wp-includes/capabilities.php

@@ -1444 +1444 @@
 
         return false;
 }
+
+/**
+ * Grants super admin privileges.
+ *
+ * @since 3.0.0
+ * @param int $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 ( isset($super_admins) )
+                return false;
+
+        do_action( 'grant_super_admin', $user_id );
+
+        // Directly fetch site_admins instead of using get_super_admins()
+        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+
+        $user = get_userdata( $user_id );
+        if ( $user && ! 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 );
+                return true;
+        }
+        return false;
+}
+
+/**
+ * Revokes super admin privileges.
+ *
+ * @since 3.0.0
+ * @param int $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 ( isset($super_admins) )
+                return false;
+
+        do_action( 'revoke_super_admin', $user_id );
+
+        // Directly fetch site_admins instead of using get_super_admins()
+        $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+
+        $user = get_userdata( $user_id );
+        if ( $user && $user->user_email != get_site_option( 'admin_email' ) ) {
+                if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
+                        unset( $super_admins[$key] );
+                        update_site_option( 'site_admins', $super_admins );
+                        do_action( 'revoked_super_admin', $user_id );
+                        return true;
+                }
+        }
+        return false;
+}