Changeset 54545 for branches/5.9/src/wp-includes/user.php

Timestamp:

10/17/2022 05:39:34 PM (3 years ago)

Author:

audrasjb

Message:

Grouped backports to the 5.9 branch.

• Editor: Bump @wordpress packages for the 5.9 branch,
• Media: Refactor search by filename within the admin,
• REST API: Lockdown post parameter of the terms endpoint,
• Customize: Escape blogname option in underscores templates,
• Query: Validate relation in WP_Date_Query,
• Users: Revert use of shared objects for current user,
• Posts, Post types: Apply KSES to post-by-email content,
• General: Validate host on "Are you sure?" screen,
• Posts, Post types: Remove emails from post-by-email logs,
• Pings/trackbacks: Apply KSES to all trackbacks,
• Mail: Reset PHPMailer properties between use,
• Comments: Apply kses when editing comments,
• Widgets: Escape RSS error messages for display.

Merges [54521-54530] to the 5.9 branch.
Props audrasjb, costdev, cu121, dd32, davidbaumwald, ehtis, johnbillion, johnjamesjacoby, martinkrcho, matveb, oztaser, paulkevan, peterwilsoncc, ravipatel, SergeyBiryukov, talldanwp, timothyblynjacobs, tykoted, voldemortensen, vortfu, xknown.

Location:

branches/5.9

Files:

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

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

@@ -1711 +1711 @@
  * @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 );
@@ -1742 +1737 @@
      */
     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, '' );
-    }
 }