Changeset 43479 for branches/4.9/src/wp-admin/includes/user.php

Timestamp:

07/17/2018 02:17:42 PM (8 years ago)

Author:

SergeyBiryukov

Message:

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

Props ianbelanger, allendav.
Merges [43478] to the 4.9 branch.
Fixes #44181.

Location:

branches/4.9

Files:

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

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

@@ -631 +631 @@
                                 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(
                                                 'action_type',
@@ -639 +639 @@
                                         );
                                 }
-                                $action_type               = sanitize_text_field( wp_unslash( $_POST['type_of_action'] ) ); // WPCS: input var ok.
-                                $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_to_export'] ) ); // 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_for_privacy_request'] ) );
                                 $email_address             = '';
 
@@ -656 +656 @@
                                         if ( ! $user instanceof WP_User ) {
                                                 add_settings_error(
-                                                        'username_or_email_to_export',
-                                                        'username_or_email_to_export',
+                                                        'username_or_email_for_privacy_request',
+                                                        'username_or_email_for_privacy_request',
                                                         __( 'Unable to add this request. A valid email address or username must be supplied.' ),
                                                         'error'
@@ -676 +676 @@
                                 if ( is_wp_error( $request_id ) ) {
                                         add_settings_error(
-                                                'username_or_email_to_export',
-                                                'username_or_email_to_export',
+                                                'username_or_email_for_privacy_request',
+                                                'username_or_email_for_privacy_request',
                                                 $request_id->get_error_message(),
                                                 'error'
@@ -684 +684 @@
                                 } elseif ( ! $request_id ) {
                                         add_settings_error(
-                                                'username_or_email_to_export',
-                                                'username_or_email_to_export',
+                                                'username_or_email_for_privacy_request',
+                                                'username_or_email_for_privacy_request',
                                                 __( 'Unable to initiate confirmation request.' ),
                                                 'error'
@@ -695 +695 @@
 
                                 add_settings_error(
-                                        'username_or_email_to_export',
-                                        'username_or_email_to_export',
+                                        'username_or_email_for_privacy_request',
+                                        'username_or_email_for_privacy_request',
                                         __( 'Confirmation request initiated successfully.' ),
                                         'updated'
@@ -774 +774 @@
 
                         <div class="wp-privacy-request-form-field">
-                                <label for="username_or_email_to_export"><?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" />
+                                <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_for_privacy_request" name="username_or_email_for_privacy_request" />
                                 <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
                         </div>
@@ -847 +847 @@
 
                         <div class="wp-privacy-request-form-field">
-                                <label for="username_or_email_to_export"><?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" />
+                                <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_for_privacy_request" name="username_or_email_for_privacy_request" />
                                 <?php submit_button( __( 'Send Request' ), 'secondary', 'submit', false ); ?>
                         </div>