Make WordPress Core


Ignore:
Timestamp:
10/11/2018 04:03:23 AM (5 years ago)
Author:
SergeyBiryukov
Message:

Privacy: Revert [43614] from the 4.9 branch.

This change is out of the 4.9.x scope, and will be reintroduced in 5.0.x.

See #43985.

Location:
branches/4.9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.9

    • Property svn:mergeinfo changed
      /trunkreverse-merged: 43568
  • branches/4.9/src/wp-includes/user.php

    r43624 r43705  
    32803280 *
    32813281 * @param string $request_id ID of the request created via wp_create_user_request().
    3282  * @return bool|WP_Error True on success, `WP_Error` on failure.
     3282 * @return WP_Error|bool Will return true/false based on the success of sending the email, or a WP_Error object.
    32833283 */
    32843284function wp_send_user_request( $request_id ) {
     
    32873287
    32883288    if ( ! $request ) {
    3289         return new WP_Error( 'invalid_request', __( 'Invalid user request.' ) );
    3290     }
    3291 
    3292     // Localize message content for user; fallback to site default for visitors.
    3293     if ( ! empty( $request->user_id ) ) {
    3294         $locale = get_user_locale( $request->user_id );
    3295     } else {
    3296         $locale = get_locale();
    3297     }
    3298 
    3299     $switched_locale = switch_to_locale( $locale );
     3289        return new WP_Error( 'user_request_error', __( 'Invalid request.' ) );
     3290    }
    33003291
    33013292    $email_data = array(
     
    33863377    $subject = apply_filters( 'user_request_action_email_subject', $subject, $email_data['sitename'], $email_data );
    33873378
    3388     $email_sent = wp_mail( $email_data['email'], $subject, $content );
    3389 
    3390     if ( $switched_locale ) {
    3391         restore_previous_locale();
    3392     }
    3393 
    3394     if ( ! $email_sent ) {
    3395         return new WP_Error( 'privacy_email_error', __( 'Unable to send personal data export confirmation email.' ) );
    3396     }
    3397 
    3398     return true;
     3379    return wp_mail( $email_data['email'], $subject, $content );
    33993380}
    34003381
     
    34463427
    34473428    if ( ! $request ) {
    3448         return new WP_Error( 'invalid_request', __( 'Invalid request.' ) );
     3429        return new WP_Error( 'user_request_error', __( 'Invalid request.' ) );
    34493430    }
    34503431
     
    35333514     * @var int
    35343515     */
     3516
    35353517    public $user_id = 0;
    35363518
Note: See TracChangeset for help on using the changeset viewer.