Changeset 20410

Timestamp:

04/09/2012 10:01:07 PM (12 years ago)

Author:

ryan

Message:

When fetching the user in get_currentuserinfo(), make sure it is a valid WP_User object. If it is stdClass, upgrade it to WP_User. If it is WP_Error, an int, or anything else, set the current user to ID 0.

In wp_set_current_user(), return the current user global only if it is a WP_User object. If it is not, fall through and go about setting it up properly.

Formatting cleanups for both functions.

see #20372

File:

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

trunk/wp-includes/pluggable.php

@@ -28 +28 @@
     global $current_user;
 
-    if ( isset($current_user) && ($id == $current_user->ID) )
+    if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) )
         return $current_user;
 
-    $current_user = new WP_User($id, $name);
-
-    setup_userdata($current_user->ID);
+    $current_user = new WP_User( $id, $name );
+
+    setup_userdata( $current_user->ID );
 
     do_action('set_current_user');
@@ -76 +76 @@
 
     if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-        wp_set_current_user(0);
+        wp_set_current_user( 0 );
         return false;
     }
 
-    if ( ! empty($current_user) )
-        return;
+    if ( ! empty( $current_user ) ) {
+        if ( $current_user instanceof WP_User )
+            return;
+
+        // Upgrade stdClass to WP_User
+        if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
+            $cur_id = $current_user->ID;
+            $current_user = null;
+            wp_set_current_user( $cur_id );
+            return;
+        }
+
+        // $current_user has a junk value. Force to WP_User with ID 0.
+        $current_user = null;
+        wp_set_current_user( 0 );
+        return false;
+    }
 
     if ( ! $user = wp_validate_auth_cookie() ) {
-         if ( is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
-            wp_set_current_user(0);
+         if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) || !$user = wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' ) ) {
+            wp_set_current_user( 0 );
             return false;
          }
     }
 
-    wp_set_current_user($user);
+    wp_set_current_user( $user );
 }
 endif;