Ticket #43922: 43922.diff

src/wp-admin/includes/admin-filters.php

@@ -133 +133 @@
 add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
 
 // Privacy hooks
+add_filter( 'wp_privacy_personal_data_erasure_page', 'wp_privacy_process_personal_data_erasure_page', 10, 5 );
 add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 6 );
 add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );
 

src/wp-admin/includes/user.php

@@ -917 +917 @@
 }
 
 /**
+ * Intercept personal data eraser page ajax responses in order to determine if the request is complete yet.
+ * @see wp_privacy_personal_data_erasure_page
+ * @since 4.9.6
+ *
+ * @param array $response The response from the personal data eraser for the given page.
+ * @param int $eraser_index The index of the personal data eraser. Begins at 1.
+ * @param string $email_address The email address of the user whose personal data this is.
+ * @param int $page The page of personal data for this eraser. Begins at 1.
+ * @param int $request_id The request ID for this personal data erasure.
+ * @return array The filtered response.
+ */
+function wp_privacy_process_personal_data_erasure_page( $response, $eraser_index, $email_address, $page, $request_id ) {
+        /* Do some simple checks on the shape of the response from the eraser.
+         * If the eraser response is malformed, don't attempt to consume it - let it
+         * pass through to generate a warning to the user by default ajax processing.
+         */
+        if ( ! is_array( $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'done', $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'items_removed', $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'items_retained', $response ) ) {
+                return $response;
+        }
+
+        if ( ! array_key_exists( 'messages', $response ) ) {
+                return $response;
+        }
+
+        // Get the request data.
+        $request = wp_get_user_request_data( $request_id );
+
+        if ( ! $request || 'remove_personal_data' !== $request->action_name ) {
+                wp_send_json_error( __( 'Invalid request ID when processing eraser data.' ) );
+        }
+
+        // If we are not yet on the last page of the last exporter, return now.
+        $erasers = apply_filters( 'wp_privacy_personal_data_erasers', array() );
+        $is_last_eraser = $eraser_index === count( $erasers );
+        $eraser_done = $response['done'];
+        if ( ! $is_last_eraser || ! $eraser_done ) {
+                return $response;
+        }
+
+        // Update the request to completed state.
+        _wp_privacy_completed_request( $request_id );
+
+        return $response;
+}
+
+/**
  * Add requests pages.
  *
  * @since 4.9.6