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

Timestamp:

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

Author:

nacin

Message:

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

File:

• trunk/wp-includes/ms-functions.php (modified) (7 diffs)

trunk/wp-includes/ms-functions.php

@@ -184 +184 @@
     switch_to_blog($blog_id);
 
-    $user = new WP_User($user_id);
-
-    if ( ! $user->exists() ) {
+    $user = get_userdata( $user_id );
+
+    if ( ! $user ) {
         restore_current_blog();
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
@@ -247 +247 @@
 
     // wp_revoke_user($user_id);
-    $user = new WP_User($user_id);
-    if ( ! $user->exists() ) {
+    $user = get_userdata( $user_id );
+    if ( ! $user ) {
         restore_current_blog();
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
@@ -1057 +1057 @@
         return false;
 
-    $user = new WP_User($user_id);
+    $user = get_userdata( $user_id );
 
     $options_site_url = esc_url(network_admin_url('settings.php'));
@@ -1234 +1234 @@
 
     $url = get_blogaddress_by_id($blog_id);
-    $user = new WP_User($user_id);
+    $user = get_userdata( $user_id );
 
     $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
@@ -1283 +1283 @@
     $welcome_email = get_site_option( 'welcome_user_email' );
 
-    $user = new WP_User($user_id);
+    $user = get_userdata( $user_id );
 
     $welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
@@ -1509 +1509 @@
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
     global $wpdb;
-    $user = new WP_User( (int) $user_id );
+    $user = get_userdata( (int) $user_id );
     $wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
 }
@@ -1752 +1752 @@
         $user_id = get_user_id_from_string( $username );
     }
-    $u = new WP_User( $user_id );
+    $u = get_userdata( $user_id );
 
     return ( isset( $u->spam ) && $u->spam == 1 );