Ticket #44644: 44644.2.diff

src/wp-admin/includes/file.php

@@ -2550 +2550 @@
                 if ( is_wp_error( $mail_success ) ) {
                         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.
                 $export_file_url = get_post_meta( $request_id, '_export_file_url', true );
@@ -2558 +2561 @@
                 }
         }
 
-        // Update the request to completed state.
-        _wp_privacy_completed_request( $request_id );
-
         return $response;
 }

tests/phpunit/tests/privacy/wpPrivacyProcessPersonalDataExportPage.php

@@ -615 +615 @@
          */
         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',
                                 'last',
@@ -624 +624 @@
                                 true,
                                 'last',
                         ),
+                        // 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-completed',
+                                'request-pending',
                                 'last',
                                 'last',
                                 'last',