Changeset 54544

Timestamp:

10/17/2022 04:53:54 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Users: Revert use of shared objects for current user.

Reverts [50790].

Props oztaser, ravipatel, dd32, costdev, SergeyBiryukov, tykoted, cu121, xknown.
Merges [54397] to the 6.0 branch.
Fixes #54984.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (2 diffs)
• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/pluggable.php (modified) (1 diff)

branches/6.0/src/wp-includes/pluggable.php

@@ -92 +92 @@
          * @since 2.8.0
          * @since 4.4.0 Added 'ID' as an alias of 'id' for the `$field` parameter.
-         * @since 5.8.0 Returns the global `$current_user` if it's the user being fetched.
          *
          * @global WP_User $current_user The current user object which holds the user data.
@@ -101 +100 @@
          */
         function get_user_by( $field, $value ) {
-                global $current_user;
-
                 $userdata = WP_User::get_data_by( $field, $value );
 
                 if ( ! $userdata ) {
                         return false;
-                }
-
-                if ( $current_user instanceof WP_User && $current_user->ID === (int) $userdata->ID ) {
-                        return $current_user;
                 }
 

branches/6.0/src/wp-includes/user.php

@@ -1855 +1855 @@
  * @since 3.0.0
  * @since 4.4.0 'clean_user_cache' action was added.
- * @since 5.8.0 Refreshes the global user instance if cleaning the user cache for the current user.
- *
- * @global WP_User $current_user The current user object which holds the user data.
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
-        global $current_user;
-
         if ( is_numeric( $user ) ) {
                 $user = new WP_User( $user );
@@ -1886 +1881 @@
          */
         do_action( 'clean_user_cache', $user->ID, $user );
-
-        // Refresh the global user instance if the cleaning current user.
-        if ( get_current_user_id() === (int) $user->ID ) {
-                $user_id      = (int) $user->ID;
-                $current_user = null;
-                wp_set_current_user( $user_id, '' );
-        }
 }
 

branches/6.0/tests/phpunit/tests/pluggable.php

@@ -340 +340 @@
         }
 
-        /**
-         * @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.
-                $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 );
-
-                $this->assertSame( $current_user, $from_get_user_by );
-        }
 }