Changeset 45148

Timestamp:

04/09/2019 12:03:07 AM (6 years ago)

Author:

pento

Message:

Privacy: Only mark a personal data export as complete when the user downloads it.

An admin may download an export to check that it's all correct, but this action shouldn't mark the request as complete.

Props garrett-eclipse, JoshuaWold, birgire.
Fixes #44644.

Location:

trunk

Files:

• src/wp-admin/includes/file.php (modified) (2 diffs)
• tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php (modified) (2 diffs)

trunk/src/wp-admin/includes/file.php

@@ -2551 +2551 @@
             wp_send_json_error( $mail_success->get_error_message() );
         }
+
+        // Update the request to completed state when the export email is sent.
+        _wp_privacy_completed_request( $request_id );
     } else {
         // Modify the response to include the URL of the export file so the browser can fetch it.
@@ -2559 +2562 @@
     }
 
-    // Update the request to completed state.
-    _wp_privacy_completed_request( $request_id );
-
     return $response;
 }

trunk/tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php

@@ -616 +616 @@
     public function data_export_page_status_transitions() {
         return array(
-            // Mark the request as completed for the last exporter on the last page, with and without email.
+            // Mark the request as completed for the last exporter on the last page, with email.
             array(
                 'request-completed',
@@ -625 +625 @@
                 'last',
             ),
-            array(
-                'request-completed',
+            // Leave the request as pending for the last exporter on the last page, without email.
+            // This check was updated to account for admin vs user export.
+            // Don't mark the request as completed when it's an admin download.
+            array(
+                'request-pending',
                 'last',
                 'last',