Changeset 43614 for branches/4.9/src/wp-includes/user.php

Timestamp:

09/03/2018 09:00:16 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Ensure the user request email is sent in the requested user's locale (or the site's default locale if they are not a registered user) when the administrator creating the request uses a different locale.

Props desrosj, Chouby, iandunn, lbenicio, birgire, earnjam, swissspidy, garrett-eclipse.
Merges [43568] to the 4.9 branch.
Fixes #43985.

Location:

branches/4.9

Files:

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

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

@@ -3280 +3280 @@
  *
  * @param string $request_id ID of the request created via wp_create_user_request().
- * @return WP_Error|bool Will return true/false based on the success of sending the email, or a WP_Error object.
+ * @return bool|WP_Error True on success, `WP_Error` on failure.
  */
 function wp_send_user_request( $request_id ) {
@@ -3287 +3287 @@
 
     if ( ! $request ) {
-        return new WP_Error( 'user_request_error', __( 'Invalid request.' ) );
-    }
+        return new WP_Error( 'invalid_request', __( 'Invalid user request.' ) );
+    }
+
+    // Localize message content for user; fallback to site default for visitors.
+    if ( ! empty( $request->user_id ) ) {
+        $locale = get_user_locale( $request->user_id );
+    } else {
+        $locale = get_locale();
+    }
+
+    $switched_locale = switch_to_locale( $locale );
 
     $email_data = array(
@@ -3377 +3386 @@
     $subject = apply_filters( 'user_request_action_email_subject', $subject, $email_data['sitename'], $email_data );
 
-    return wp_mail( $email_data['email'], $subject, $content );
+    $email_sent = wp_mail( $email_data['email'], $subject, $content );
+
+    if ( $switched_locale ) {
+        restore_previous_locale();
+    }
+
+    if ( ! $email_sent ) {
+        return new WP_Error( 'privacy_email_error', __( 'Unable to send personal data export confirmation email.' ) );
+    }
+
+    return true;
 }
 
@@ -3427 +3446 @@
 
     if ( ! $request ) {
-        return new WP_Error( 'user_request_error', __( 'Invalid request.' ) );
+        return new WP_Error( 'invalid_request', __( 'Invalid request.' ) );
     }
 
@@ -3514 +3533 @@
      * @var int
      */
-
     public $user_id = 0;