sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

git-svn-id: https://develop.svn.wordpress.org/trunk@34947 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-10-08 17:28:34 +00:00
parent 17e2841eea
commit a1389117b2
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wp-includes/pluggable.php
View File

@ -26,8 +26,14 @@ if ( !function_exists('wp_set_current_user') ) :
function wp_set_current_user($id, $name = '') { function wp_set_current_user($id, $name = '') {
global $current_user; 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; return $current_user;
}
$current_user = new WP_User( $id, $name ); $current_user = new WP_User( $id, $name );

36
tests/phpunit/tests/user/wpSetCurrentUser.php
View File

@ -23,5 +23,41 @@ class Tests_User_WpSetCurrentUser extends WP_UnitTestCase {
$this->assertEquals( $user, wp_get_current_user() ); $this->assertEquals( $user, wp_get_current_user() );
$this->assertSame( $u, get_current_user_id() ); $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() );
}
} }