Ticket #28020: 28020.2.diff

src/wp-includes/pluggable.php

@@ -17 +17 @@
          * actions on users who aren't signed in.
          *
          * @since 2.0.3
+         * @since 5.3.0 `$force` param was added.
          * @global WP_User $current_user The current user object which holds the user data.
          *
-         * @param int    $id   User ID
-         * @param string $name User's username
+         * @param int    $id    User ID
+         * @param string $name  User's username
+         * @param bool   $force Set to true to force the re-setup of the current user object
          * @return WP_User Current user User object
          */
-        function wp_set_current_user( $id, $name = '' ) {
+        function wp_set_current_user( $id, $name = '', $force = false ) {
                 global $current_user;
 
                 // If `$id` matches the current user, there is nothing to do.
@@ -31 +33 @@
                 && ( $current_user instanceof WP_User )
                 && ( $id == $current_user->ID )
                 && ( null !== $id )
+                && ( !$force )
                 ) {
                         return $current_user;
                 }
@@ -90 +93 @@
          *
          * @since 2.8.0
          * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter.
+         * @since 5.3.0 Return the global $current_user if it's the user being fetched.
          *
          * @param string     $field The field to retrieve the user with. id | ID | slug | email | login.
          * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
          * @return WP_User|false WP_User object on success, false on failure.
          */
         function get_user_by( $field, $value ) {
+                global $current_user;
+
                 $userdata = WP_User::get_data_by( $field, $value );
 
                 if ( ! $userdata ) {
                         return false;
                 }
+                
+                if ( ! empty( $current_user ) 
+                        && $current_user instanceof WP_User
+                        && $current_user->ID == $userdata->ID ) {
+                        
+                        return $current_user;
+
+                }
 
                 $user = new WP_User;
                 $user->init( $userdata );
@@ -637 +651 @@
                         return false;
                 }
 
-                $user = get_user_by( 'login', $username );
+                $user = get_user_by( 'login', $username, false );
                 if ( ! $user ) {
                         /**
                          * Fires if a bad username is entered in the user authentication process.

src/wp-includes/user.php

@@ -1360 +1360 @@
  *
  * @since 3.0.0
  * @since 4.4.0 'clean_user_cache' action was added.
+ * @since 5.3.0 Force re-setup if it is the current user's cache to be cleaned.
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
@@ -1386 +1387 @@
          * @param WP_User $user    User object.
          */
         do_action( 'clean_user_cache', $user->ID, $user );
+        
+        /**
+         * Force re-setup of current user if it is user's cache to be cleaned.
+         * 
+         * @since 5.3.0
+         */
+        if ( get_current_user_id() == $user->ID ) {
+                wp_set_current_user( $user->ID, '', true );
+        }
 }
 
 /**

tests/phpunit/tests/pluggable.php

@@ -128 +128 @@
                         'wp_set_current_user'             => array(
                                 'id',
                                 'name' => '',
+                                'force' => false // ticket 28020
                         ),
                         'wp_get_current_user'             => array(),
                         'get_userdata'                    => array( 'user_id' ),
@@ -319 +320 @@
                 return $signatures;
         }
 
+        /**
+         * @ticket 28020
+         */
+        public function test_get_user_by_should_return_same_instance_as_wp_get_current_user() {
+
+                // Create a test user
+                $new_user = self::factory()->user->create( array(
+                        'role' => 'subscriber'
+                ) );
+
+                // Set the test user as the current user
+                wp_set_current_user( $new_user );
+
+                // Get the test user using get_user_by()
+                $from_get_user_by = get_user_by( 'id', $new_user );
+
+                // Set the test user role as editor
+                $from_get_user_by->set_role( 'administrator' );
+
+                // current_user_can() should reflect the same changes applied to the instance returned
+                // by get_user_by().
+                $this->assertTrue( current_user_can( 'administrator') );
+
+        }
+
 }