Ticket #11271: 11271-setup_userdata.patch

wp-includes/user.php

@@ -451 +451 @@
  * @param int $user_id Optional. User ID to setup global data.
  */
 function setup_userdata($user_id = '') {
-        global $user_login, $userdata, $user_level, $user_id, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
-
+        global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_pass_md5, $user_identity;
+        
         if ( '' == $user_id )
                 $user = wp_get_current_user();
         else
@@ -461 +461 @@
         if ( 0 == $user->ID )
                 return;
 
-        $userdata = $user->data;
-        $user_login     = $user->user_login;
-        $user_level     = (int) isset($user->user_level) ? $user->user_level : 0;
-        $user_id = $user_ID = (int) $user->ID;
-        $user_email     = $user->user_email;
-        $user_url       = $user->user_url;
-        $user_pass_md5  = md5($user->user_pass);
-        $user_identity  = $user->display_name;
+        $userdata   = $user->data;
+        $user_login = $user->user_login;
+        $user_level = (int) isset( $user->user_level ) ? $user->user_level : 0;
+        $user_ID    = (int) $user->ID;
+        $user_email = $user->user_email;
+        $user_url   = $user->user_url;
+        $user_pass_md5 = md5( $user->user_pass );
+        $user_identity = $user->display_name;
 }
 
 /**