Changeset 54548 for branches/5.8/src/wp-includes/pluggable.php

Timestamp:

10/17/2022 05:46:39 PM (14 months ago)

Author:

audrasjb

Message:

Grouped backports to the 5.8 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.8 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.8

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (3 diffs)

branches/5.8/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;
         }
 
@@ -362 +355 @@
         $phpmailer->clearCustomHeaders();
         $phpmailer->clearReplyTos();
+        $phpmailer->Body    = '';
+        $phpmailer->AltBody = '';
 
         // Set "From" name and email.