Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-28 15:54:57 +02:00
Code Issues Projects Releases Wiki Activity

Privacy: Rename username_or_email_to_export POST variable on Erase Personal Data screen to a more generic username_or_email_for_privacy_request.

Browse Source 
Props ianbelanger, allendav.
Merges [43478] to the 4.9 branch.
Fixes #44181.
Built from https://develop.svn.wordpress.org/branches/4.9@43479


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43306 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-07-17 14:18:27 +00:00
parent 42a2dc2f7a
commit 29dfd13361
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wp-admin/includes/user.php
View File

@ -630,7 +630,7 @@ function _wp_personal_data_handle_actions() {
case 'add_remove_personal_data_request': case 'add_remove_personal_data_request':
check_admin_referer( 'personal-data-request' ); check_admin_referer( 'personal-data-request' );
if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_to_export'] ) ) { // WPCS: input var ok. if ( ! isset( $_POST['type_of_action'], $_POST['username_or_email_for_privacy_request'] ) ) {
add_settings_error( add_settings_error(
'action_type', 'action_type',
'action_type', 'action_type',
@ -638,8 +638,8 @@ function _wp_personal_data_handle_actions() {
'error' 'error'
); );
} }
$action_type = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) ); // WPCS: input var ok. $action_type = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) );
$username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_to_export'] ) ); // WPCS: input var ok. $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
$email_address = ''; $email_address = '';
if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) { if ( ! in_array( $action_type, _wp_privacy_action_request_types(), true ) ) {
@ -655,8 +655,8 @@ function _wp_personal_data_handle_actions() {
$user = get_user_by( 'login', $username_or_email_address ); $user = get_user_by( 'login', $username_or_email_address );
if ( ! $user instanceof WP_User ) { if ( ! $user instanceof WP_User ) {
add_settings_error( add_settings_error(
'username_or_email_to_export', 'username_or_email_for_privacy_request',
'username_or_email_to_export', 'username_or_email_for_privacy_request',
__( 'Unable to add this request. A valid email address or username must be supplied.' ), __( 'Unable to add this request. A valid email address or username must be supplied.' ),
'error' 'error'
); );
@ -675,16 +675,16 @@ function _wp_personal_data_handle_actions() {
if ( is_wp_error( $request_id ) ) { if ( is_wp_error( $request_id ) ) {
add_settings_error( add_settings_error(
'username_or_email_to_export', 'username_or_email_for_privacy_request',
'username_or_email_to_export', 'username_or_email_for_privacy_request',
$request_id->get_error_message(), $request_id->get_error_message(),
'error' 'error'
); );
break; break;
} elseif ( ! $request_id ) { } elseif ( ! $request_id ) {
add_settings_error( add_settings_error(
'username_or_email_to_export', 'username_or_email_for_privacy_request',
'username_or_email_to_export', 'username_or_email_for_privacy_request',
__( 'Unable to initiate confirmation request.' ), __( 'Unable to initiate confirmation request.' ),
'error' 'error'
); );
@ -694,8 +694,8 @@ function _wp_personal_data_handle_actions() {
wp_send_user_request( $request_id ); wp_send_user_request( $request_id );
add_settings_error( add_settings_error(
'username_or_email_to_export', 'username_or_email_for_privacy_request',
'username_or_email_to_export', 'username_or_email_for_privacy_request',
__( 'Confirmation request initiated successfully.' ), __( 'Confirmation request initiated successfully.' ),
'updated' 'updated'
); );
@ -773,8 +773,8 @@ function _wp_personal_data_export_page() {
<p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p> <p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
<div class="wp-privacy-request-form-field"> <div class="wp-privacy-request-form-field">
<label for="username_or_email_to_export"><?php esc_html_e( 'Username or email address' ); ?></label> <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
<input type="text" required class="regular-text" id="username_or_email_to_export" name="username_or_email_to_export" /> <input type="text" required class="regular-text" id="username_or_email_for_privacy_request" name="username_or_email_for_privacy_request" />
<?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?> <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
</div> </div>
<?php wp_nonce_field( 'personal-data-request' ); ?> <?php wp_nonce_field( 'personal-data-request' ); ?>
@ -846,8 +846,8 @@ function _wp_personal_data_removal_page() {
<p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p> <p><?php esc_html_e( 'An email will be sent to the user at this email address asking them to verify the request.' ); ?></p>
<div class="wp-privacy-request-form-field"> <div class="wp-privacy-request-form-field">
<label for="username_or_email_to_export"><?php esc_html_e( 'Username or email address' ); ?></label> <label for="username_or_email_for_privacy_request"><?php esc_html_e( 'Username or email address' ); ?></label>
<input type="text" required class="regular-text" id="username_or_email_to_export" name="username_or_email_to_export" /> <input type="text" required class="regular-text" id="username_or_email_for_privacy_request" name="username_or_email_for_privacy_request" />
<?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?> <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
</div> </div>
<?php wp_nonce_field( 'personal-data-request' ); ?> <?php wp_nonce_field( 'personal-data-request' ); ?>

2
wp-includes/version.php
View File

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