Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Props birgire, desrosj.
Fixes #44099.
Built from https://develop.svn.wordpress.org/trunk@43375


git-svn-id: http://core.svn.wordpress.org/trunk@43203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2018-06-28 02:42:03 +00:00
parent 2afe7146c8
commit 3ce87b62f9
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/user.php
View File

@ -2973,7 +2973,8 @@ function _wp_privacy_send_request_confirmation_notification( $request_id ) {
return;
}
$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 );
/**
* Filters the recipient of the data request confirmation notification.
@ -2994,7 +2995,7 @@ function _wp_privacy_send_request_confirmation_notification( $request_id ) {
$email_data = array(
'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' ),
'siteurl' => home_url(),
@ -3057,9 +3058,10 @@ All at ###SITENAME###
$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
$subject = sprintf(
/* translators: %s Site name. */
__( '[%s] Action Confirmed' ),
$blogname
/* translators: 1: Site name. 2: Name of the confirmed action. */
__( '[%1$s] Action Confirmed: %2$s' ),
$blogname,
$action_description
);
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.0-alpha-43374';
$wp_version = '5.0-alpha-43375';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.