Changeset 34947

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.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (1 diff)
• tests/phpunit/tests/user/wpSetCurrentUser.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 );

trunk/tests/phpunit/tests/user/wpSetCurrentUser.php

@@ -24 +24 @@
         $this->assertSame( $u, get_current_user_id() );
     }
+
+    public function test_should_set_by_name_if_id_is_null_and_current_user_is_nonempty() {
+        $u1 = $this->factory->user->create();
+        wp_set_current_user( $u1 );
+        $this->assertSame( $u1, get_current_user_id() );
+
+        $u2 = $this->factory->user->create( array(
+            'user_login' => 'foo',
+        ) );
+
+        $user = wp_set_current_user( null, 'foo' );
+
+        $this->assertSame( $u2, $user->ID );
+        $this->assertEquals( $user, wp_get_current_user() );
+        $this->assertSame( $u2, get_current_user_id() );
+    }
+
+    /**
+     * Test that you can set the current user by the name parameter when the current user is 0.
+     *
+     * @ticket 20845
+     */
+    public function test_should_set_by_name_if_id_is_null() {
+        wp_set_current_user( 0 );
+        $this->assertSame( 0, get_current_user_id() );
+
+        $u = $this->factory->user->create( array(
+            'user_login' => 'foo',
+        ) );
+
+        $user = wp_set_current_user( null, 'foo' );
+
+        $this->assertSame( $u, $user->ID );
+        $this->assertEquals( $user, wp_get_current_user() );
+        $this->assertSame( $u, get_current_user_id() );
+    }
 }