Changeset 54397

Timestamp:

10/06/2022 04:36:46 AM (22 months ago)

Author:

peterwilsoncc

Message:

Users: Revert use of shared objects for current user.

Reverts [50790].

Props oztaser, ravipatel, dd32, costdev, SergeyBiryukov, tykoted, cu121, xknown.
Fixes #54984.

Location:

trunk

Files:

• src/wp-includes/pluggable.php (modified) (2 diffs)
• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/pluggable/getUserBy.php (deleted)

trunk/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;
         }
 

trunk/src/wp-includes/user.php

@@ -1874 +1874 @@
  * @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 );
@@ -1908 +1903 @@
      */
     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, '' );
-    }
 }