Ticket #20845: 20845-1.3.patch

src/wp-includes/pluggable.php

@@ -26 +26 @@
 function wp_set_current_user($id, $name = '') {
         global $current_user;
 
-        if ( isset( $current_user ) && ( $current_user instanceof WP_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 );

tests/phpunit/tests/user/wpSetCurrentUser.php

@@ +1 @@
+<?php 
+
+/**
+ * @group user
+ */
+class Tests_User_WpSetCurrentUser extends WP_UnitTestCase {
+
+        /**
+         * Test that you can set the current user by the name parameter
+         *
+         * Initially we expect the current user to not be set - giving ID=0
+         * Trying to set it to "admin" should return ID=1
+         *
+         * @ticket 20845
+         */
+        function test_wp_set_current_user_by_name() {
+                $user = wp_get_current_user();
+                $this->assertEquals( $user->ID, 0 );
+                $admin_user = wp_set_current_user( null, "admin" );
+                $this->assertEquals( $admin_user->ID, 1 );
+                $this->assertEquals( $admin_user->user_login, "admin" );
+        }
+        
+        /**
+         * Demonstrate that the ID value trumps the name value
+         *
+         */
+        function test_wp_set_current_user_id_trumps_name() {
+                $admin_user = wp_set_current_user( "admin", "bobbingwide" );
+                $this->assertEquals( $admin_user->ID, 1 );
+                $this->assertEquals( $admin_user->user_login, "admin" );
+        }
+        
+}
+