Changeset 12300 for trunk/wp-includes/user.php

Timestamp:

12/01/2009 02:06:02 AM (17 years ago)

Author:

ryan

Message:

Accept either user_id or user_ID. Remove user_id global. see #11271 #11222

File:

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

trunk/wp-includes/user.php

@@ -452 +452 @@
  */
 function setup_userdata($for_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 ( '' == $for_user_id )
@@ -465 +465 @@
         $user_login     = $user->user_login;
         $user_level     = (int) isset($user->user_level) ? $user->user_level : 0;
-        $user_id = $user_ID = (int) $user->ID;
+        $user_ID = (int) $user->ID;
         $user_email     = $user->user_email;
         $user_url       = $user->user_url;