Changeset 34947 for trunk/src/wp-includes/pluggable.php

Timestamp:

10/08/2015 05:28:34 PM (10 years ago)

Author:

boonebgorges

Message:

Allow a null id to do a name lookup in wp_set_current_user().

Previously, the name fallback was failing in the case where the current user
was 0, due to a loose comparison between 0 (the current user) and null (the
value that is used to trigger the name fallback).

Props bobbingwide.
Fixes #20845.

File:

• trunk/src/wp-includes/pluggable.php (modified) (1 diff)

trunk/src/wp-includes/pluggable.php

@@ -27 +27 @@
     global $current_user;
 
-    if ( isset( $current_user ) && ( $current_user instanceof WP_User ) && ( $id == $current_user->ID ) )
+    // If `$id` matches the user who's already current, there's nothing to do.
+    if ( isset( $current_user )
+        && ( $current_user instanceof WP_User )
+        && ( $id == $current_user->ID )
+        && ( null !== $id )
+    ) {
         return $current_user;
+    }
 
     $current_user = new WP_User( $id, $name );