Changeset 43450

Timestamp:

07/16/2018 12:08:11 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Privacy: add user request type to the admin notification email subject.

Merges [43375] to the 4.9 branch.
Props birgire, desrosj.
Fixes #44099.

Location:

branches/4.9

Files:

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

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

@@ -2896 +2896 @@
     }
 
-    $subject = sprintf(
-        /* translators: %s Site name. */
-        __( '[%s] Action Confirmed' ),
-        wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
-    );
-
-    $manage_url = add_query_arg( 'page', $request_data->action_name, admin_url( 'tools.php' ) );
+    $manage_url         = add_query_arg( 'page', $request_data->action_name, admin_url( 'tools.php' ) );
+    $action_description = wp_user_request_action_description( $request_data->action_name );
 
     /**
@@ -2923 +2918 @@
         'request'     => $request_data,
         'user_email'  => $request_data->email,
-        'description' => wp_user_request_action_description( $request_data->action_name ),
+        'description' => $action_description,
         'manage_url'  => $manage_url,
         'sitename'    => get_option( 'blogname' ),
@@ -2981 +2976 @@
     $content = str_replace( '###MANAGE_URL###', esc_url_raw( $email_data['manage_url'] ), $content );
     $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
+
+    $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+
+    $subject = sprintf(
+        /* translators: 1: Site name. 2: Name of the confirmed action. */
+        __( '[%1$s] Action Confirmed: %2$s' ),
+        $blogname,
+        $action_description
+    );
+
+    /**
+     * Filters the subject of the user request confirmation email.
+     *
+     * @since 4.9.7
+     *
+     * @param string $subject    The email subject.
+     * @param string $blogname   The name of the site.
+     * @param array  $email_data {
+     *     Data relating to the account action email.
+     *
+     *     @type WP_User_Request $request     User request object.
+     *     @type string          $user_email  The email address confirming a request
+     *     @type string          $description Description of the action being performed so the user knows what the email is for.
+     *     @type string          $manage_url  The link to click manage privacy requests of this type.
+     *     @type string          $sitename    The site name sending the mail.
+     *     @type string          $siteurl     The site URL sending the mail.
+     *     @type string          $admin_email The administrator email receiving the mail.
+     * }
+     */
+    $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $blogname, $email_data );
 
     $email_sent = wp_mail( $email_data['admin_email'], $subject, $content );