WordPress.org
Get WordPress

Make WordPress Core

Ticket #44314: 44314.10.diff

File 44314.10.diff, 8.0 KB (added by SergeyBiryukov, 3 years ago)

  • src/wp-includes/user.php

     
    36763676
    36773677        /* translators: Do not translate SITENAME, USER_EMAIL, DESCRIPTION, MANAGE_URL, SITEURL; those are placeholders. */
    36783678        $content = __(
    3679 // phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect, PEAR.Functions.FunctionCallSignature.Indent
    3680 'Howdy,
     3679                'Howdy,
    36813680
    36823681A user data privacy request has been confirmed on ###SITENAME###:
    36833682
    … …  
    36963695        /**
    36973696         * Filters the body of the user request confirmation email.
    36983697         *
    3699          * Use {@see 'user_request_confirmed_email_content'} instead.
     3698         * The email is sent to an administrator when a user request is confirmed.
    37003699         *
    3701          * The email is sent to an administrator when an user request is confirmed.
    3702          *
    37033700         * The following strings have a special meaning and will get replaced dynamically:
    37043701         *
    37053702         * ###SITENAME###    The name of the site.
    … …  
    37083705         * ###MANAGE_URL###  The URL to manage requests.
    37093706         * ###SITEURL###     The URL to the site.
    37103707         *
    3711          * For fulfillment email content use {@see 'user_erasure_fulfillment_email_content'} instead.
    3712          *
    37133708         * @since 4.9.6
     3709         * @deprecated 5.8.0 Use {@see 'user_request_confirmed_email_content'} instead.
     3710         *                   For user erasure fulfillment email content
     3711         *                   use {@see 'user_erasure_fulfillment_email_content'} instead.
    37143712         *
    3715          * @deprecated 5.8.0 Use {@see 'user_request_confirmed_email_content'} instead. For fulfillment email content use {@see 'user_erasure_fulfillment_email_content'} instead.
    3716          *
    37173713         * @param string $content    The email content.
    37183714         * @param array  $email_data {
    37193715         *     Data relating to the account action email.
    … …  
    37203716         *
    37213717         *     @type WP_User_Request $request     User request object.
    37223718         *     @type string          $user_email  The email address confirming a request
    3723          *     @type string          $description Description of the action being performed so the user knows what the email is for.
     3719         *     @type string          $description Description of the action being performed
     3720         *                                        so the user knows what the email is for.
    37243721         *     @type string          $manage_url  The link to click manage privacy requests of this type.
    37253722         *     @type string          $sitename    The site name sending the mail.
    37263723         *     @type string          $siteurl     The site URL sending the mail.
    … …  
    37323729                array( $content, $email_data ),
    37333730                '5.8.0',
    37343731                sprintf(
    3735                         /* translators: 1 & 2: Deprecation replacement options */
     3732                        /* translators: 1 & 2: Deprecation replacement options. */
    37363733                        __( '%1$s or %2$s' ),
    37373734                        'user_request_confirmed_email_content',
    37383735                        'user_erasure_fulfillment_email_content'
    … …  
    37423739        /**
    37433740         * Filters the body of the user request confirmation email.
    37443741         *
    3745          * The email is sent to an administrator when an user request is confirmed.
     3742         * The email is sent to an administrator when a user request is confirmed.
    37463743         * The following strings have a special meaning and will get replaced dynamically:
    37473744         *
    37483745         * ###SITENAME###    The name of the site.
    … …  
    38643861        /**
    38653862         * Filters the subject of the email sent when an erasure request is completed.
    38663863         *
    3867          * Use {@see 'user_erasure_fulfillment_email_subject'} instead.
    3868          *
    38693864         * @since 4.9.8
    3870          *
    38713865         * @deprecated 5.8.0 Use {@see 'user_erasure_fulfillment_email_subject'} instead.
    38723866         *
    38733867         * @param string $subject    The email subject.
    … …  
    38843878         *     @type string          $siteurl            The site URL sending the mail.
    38853879         * }
    38863880         */
    3887         $subject = apply_filters_deprecated( 'user_erasure_complete_email_subject', array( $subject, $email_data['sitename'], $email_data ), '5.8.0', 'user_erasure_fulfillment_email_subject' );
     3881        $subject = apply_filters_deprecated(
     3882                'user_erasure_complete_email_subject',
     3883                array( $subject, $email_data['sitename'], $email_data ),
     3884                '5.8.0',
     3885                'user_erasure_fulfillment_email_subject'
     3886        );
    38883887
    38893888        /**
    38903889         * Filters the subject of the email sent when an erasure request is completed.
    … …  
    39093908
    39103909        /* translators: Do not translate SITENAME, SITEURL; those are placeholders. */
    39113910        $content = __(
    3912 // phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect, PEAR.Functions.FunctionCallSignature.Indent
    3913 'Howdy,
     3911                'Howdy,
    39143912
    39153913Your request to erase your personal data on ###SITENAME### has been completed.
    39163914
    … …  
    39243922        if ( ! empty( $email_data['privacy_policy_url'] ) ) {
    39253923                /* translators: Do not translate SITENAME, SITEURL, PRIVACY_POLICY_URL; those are placeholders. */
    39263924                $content = __(
    3927 // phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect, PEAR.Functions.FunctionCallSignature.Indent
    3928 'Howdy,
     3925                        'Howdy,
    39293926
    39303927Your request to erase your personal data on ###SITENAME### has been completed.
    39313928
    … …  
    39423939        /**
    39433940         * Filters the body of the data erasure fulfillment notification.
    39443941         *
    3945          * Use {@see 'user_erasure_fulfillment_email_content'} instead.
    3946          *
    3947          * The email is sent to a user when a their data erasure request is fulfilled
     3942         * The email is sent to a user when their data erasure request is fulfilled
    39483943         * by an administrator.
    39493944         *
    39503945         * The following strings have a special meaning and will get replaced dynamically:
    … …  
    39533948         * ###PRIVACY_POLICY_URL### Privacy policy page URL.
    39543949         * ###SITEURL###            The URL to the site.
    39553950         *
    3956          * For user request confirmation email content use {@see 'user_request_confirmed_email_content'} instead.
    3957          *
    39583951         * @since 4.9.6
     3952         * @deprecated 5.8.0 Use {@see 'user_erasure_fulfillment_email_content'} instead.
     3953         *                   For user request confirmation email content
     3954         *                   use {@see 'user_request_confirmed_email_content'} instead.
    39593955         *
    3960          * @deprecated 5.8.0 Use {@see 'user_erasure_fulfillment_email_content'} instead. For user request confirmation email content use {@see 'user_request_confirmed_email_content'} instead.
    3961          *
    39623956         * @param string $content The email content.
    39633957         * @param array  $email_data {
    39643958         *     Data relating to the account action email.
    … …  
    39773971                array( $content, $email_data ),
    39783972                '5.8.0',
    39793973                sprintf(
    3980                         /* translators: 1 & 2: Deprecation replacement options */
     3974                        /* translators: 1 & 2: Deprecation replacement options. */
    39813975                        __( '%1$s or %2$s' ),
    39823976                        'user_erasure_fulfillment_email_content',
    39833977                        'user_request_confirmed_email_content'
    … …  
    39873981        /**
    39883982         * Filters the body of the data erasure fulfillment notification.
    39893983         *
    3990          * The email is sent to a user when a their data erasure request is fulfilled
     3984         * The email is sent to a user when their data erasure request is fulfilled
    39913985         * by an administrator.
    39923986         *
    39933987         * The following strings have a special meaning and will get replaced dynamically:
    … …  
    40224016        /**
    40234017         * Filters the headers of the data erasure fulfillment notification.
    40244018         *
    4025          * Use {@see 'user_erasure_fulfillment_email_headers'} instead.
    4026          *
    40274019         * @since 5.4.0
    4028          *
    40294020         * @deprecated 5.8.0 Use {@see 'user_erasure_fulfillment_email_headers'} instead.
    40304021         *
    40314022         * @param string|array $headers    The email headers.
    … …  
    40444035         *     @type string          $siteurl            The site URL sending the mail.
    40454036         * }
    40464037         */
    4047         $headers = apply_filters_deprecated( 'user_erasure_complete_email_headers', array( $headers, $subject, $content, $request_id, $email_data ), '5.8.0', 'user_erasure_fulfillment_email_headers' );
     4038        $headers = apply_filters_deprecated(
     4039                'user_erasure_complete_email_headers',
     4040                array( $headers, $subject, $content, $request_id, $email_data ),
     4041                '5.8.0',
     4042                'user_erasure_fulfillment_email_headers'
     4043        );
    40484044
    40494045        /**
    40504046         * Filters the headers of the data erasure fulfillment notification.
    … …  
    42904286
    42914287        /* translators: Do not translate DESCRIPTION, CONFIRM_URL, SITENAME, SITEURL: those are placeholders. */
    42924288        $content = __(
    4293 // phpcs:ignore Generic.WhiteSpace.ScopeIndent.Incorrect, PEAR.Functions.FunctionCallSignature.Indent
    4294 'Howdy,
     4289                'Howdy,
    42954290
    42964291A request has been made to perform the following action on your account:
    42974292