Changeset 50230 for trunk/src/wp-admin/includes/privacy-tools.php

Timestamp:

02/05/2021 03:48:59 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Rename the $send_confirmation_email parameter of wp_create_user_request() to $status, for clarity.

Follow-up to [50159], [50165].

Props xkon, TimothyBlynJacobs.
Fixes #52430. See #43890.

File:

• trunk/src/wp-admin/includes/privacy-tools.php (modified) (3 diffs)

trunk/src/wp-admin/includes/privacy-tools.php

@@ -112 +112 @@
                 $username_or_email_address = sanitize_text_field( wp_unslash( $_POST['username_or_email_for_privacy_request'] ) );
                 $email_address             = '';
-                $send_confirmation_email   = true;
+                $status                    = 'pending';
 
                 if ( ! isset( $_POST['send_confirmation_email'] ) ) {
-                    $send_confirmation_email = false;
+                    $status = 'confirmed';
                 }
 
@@ -147 +147 @@
                 }
 
-                $request_id = wp_create_user_request( $email_address, $action_type, array(), $send_confirmation_email );
+                $request_id = wp_create_user_request( $email_address, $action_type, array(), $status );
+                $message    = '';
 
                 if ( is_wp_error( $request_id ) ) {
+                    $message = $request_id->get_error_message();
+                } elseif ( ! $request_id ) {
+                    $message = __( 'Unable to initiate confirmation request.' );
+                }
+
+                if ( $message ) {
                     add_settings_error(
                         'username_or_email_for_privacy_request',
                         'username_or_email_for_privacy_request',
-                        $request_id->get_error_message(),
-                        'error'
-                    );
-                    break;
-                } elseif ( ! $request_id ) {
-                    add_settings_error(
-                        'username_or_email_for_privacy_request',
-                        'username_or_email_for_privacy_request',
-                        __( 'Unable to initiate confirmation request.' ),
+                        $message,
                         'error'
                     );
@@ -167 +166 @@
                 }
 
-                if ( $send_confirmation_email ) {
+                if ( 'pending' === $status ) {
                     wp_send_user_request( $request_id );
+
+                    $message = __( 'Confirmation request initiated successfully.' );
+                } elseif ( 'confirmed' === $status ) {
+                    $message = __( 'Request added successfully.' );
                 }
 
-                add_settings_error(
-                    'username_or_email_for_privacy_request',
-                    'username_or_email_for_privacy_request',
-                    __( 'Confirmation request initiated successfully.' ),
-                    'success'
-                );
-                break;
+                if ( $message ) {
+                    add_settings_error(
+                        'username_or_email_for_privacy_request',
+                        'username_or_email_for_privacy_request',
+                        $message,
+                        'success'
+                    );
+                    break;
+                }
         }
     }