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

Timestamp:

05/10/2018 09:04:21 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Update request confirmation notice text for clarity.

Props desrosj, melchoyce, garrett-eclipse.
Merges [43232] to the 4.9 branch.
Fixes #43970.

Location:

branches/4.9

Files:

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

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

@@ -3109 +3109 @@
  * @access private
  *
+ * @param int $request_id The request ID being confirmed.
  * @return string $message The confirmation message.
  */
-function _wp_privacy_account_request_confirmed_message( $message, $request_id ) {
+function _wp_privacy_account_request_confirmed_message( $request_id ) {
         $request = wp_get_user_request_data( $request_id );
 
+        $message = '<p class="success">' . __( 'Action has been confirmed.' ) . '</p>';
+        $message .= '<p>' . __( 'The site administrator has been notified and will fulfill your request as soon as possible.' ) . '</p>';
+
         if ( $request && in_array( $request->action_name, _wp_privacy_action_request_types(), true ) ) {
-                $message  = '<p class="message">' . __( 'Action has been confirmed.' ) . '</p>';
-                $message .= __( 'The site administrator has been notified and will fulfill your request as soon as possible.' );
-        }
+                if ( 'export_personal_data' === $request->action_name ) {
+                        $message = '<p class="success">' . __( 'Thanks for confirming your export request.' ) . '</p>';
+                        $message .= '<p>' . __( 'The site administrator has been notified. You will receive a link to download your export via email when they fulfill your request.' ) . '</p>';
+                } elseif ( 'remove_personal_data' === $request->action_name ) {
+                        $message = '<p class="success">' . __( 'Thanks for confirming your erasure request.' ) . '</p>';
+                        $message .= '<p>' . __( 'The site administrator has been notified. You will receive an email confirmation when they erase your data.' ) . '</p>';
+                }
+        }
+
+        /**
+         * Filters the message displayed to a user when they confirm a data request.
+         *
+         * @since 4.9.6
+         *
+         * @param string $message    The message to the user.
+         * @param int    $request_id The ID of the request being confirmed.
+         */
+        $message = apply_filters( 'user_request_action_confirmed_message', $message, $request_id );
 
         return $message;