Changeset 21413 for trunk/wp-admin/includes/ms.php

Timestamp:

08/03/2012 01:06:05 AM (13 years ago)

Author:

nacin

Message:

Move most instances of new WP_User to get_userdata(). see #21120.

File:

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

trunk/wp-admin/includes/ms.php

@@ -690 +690 @@
     $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
 
-    $user = new WP_User( $user_id );
-    if ( ! in_array( $user->user_login, $super_admins ) ) {
+    $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 );
@@ -718 +718 @@
     $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
 
-    $user = new WP_User( $user_id );
-    if ( $user->user_email != get_site_option( 'admin_email' ) ) {
+    $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] );