Ticket #43931: 43931.2.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_export_page', 'wp_privacy_process_personal_data_export_page', 10, 6 );
+add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 7 );
 add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );
 
 // Privacy policy text changes check.

src/wp-admin/includes/ajax-actions.php

@@ -4409 +4409 @@
                         wp_send_json_error( __( 'Exporter index out of range.' ) );
                 }
 
-                $index = $exporter_index - 1;
-
                 if ( $page < 1 ) {
                         wp_send_json_error( __( 'Page index cannot be less than one.' ) );
                 }
 
-                $exporter = $exporters[ $index ];
+                $exporter_keys = array_keys( $exporters );
+                $exporter_key = $exporter_keys[ $exporter_index - 1 ];
+                $exporter = $exporters[ $exporter_key ];
 
                 if ( ! is_array( $exporter ) ) {
                         wp_send_json_error(
@@ -4442 +4442 @@
                         );
                 }
 
-                $callback = $exporters[ $index ]['callback'];
-                $exporter_friendly_name = $exporters[ $index ]['exporter_friendly_name'];
+                $callback = $exporter['callback'];
+                $exporter_friendly_name = $exporter['exporter_friendly_name'];
 
                 $response = call_user_func( $callback, $email_address, $page );
                 if ( is_wp_error( $response ) ) {
@@ -4495 +4495 @@
          * @param int    $page            The page for this response.
          * @param int    $request_id      The privacy request post ID associated with this request.
          * @param bool   $send_as_email   Whether the final results of the export should be emailed to the user.
+         * @param int    $exporter_key    The key (slug) of the exporter that provided this data.
          */
-        $response = apply_filters( 'wp_privacy_personal_data_export_page', $response, $exporter_index, $email_address, $page, $request_id, $send_as_email );
+        $response = apply_filters( 'wp_privacy_personal_data_export_page', $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key );
 
         if ( is_wp_error( $response ) ) {
                 wp_send_json_error( $response );
@@ -4591 +4592 @@
                         wp_send_json_error( __( 'Page index cannot be less than one.' ) );
                 }
 
-                $index  = $eraser_index - 1; // Convert to zero based for eraser index.
-                $eraser = $erasers[ $index ];
+                $eraser_keys = array_keys( $erasers );
+                $eraser_key = $eraser_keys[ $eraser_index - 1 ];
+                $eraser = $erasers[ $eraser_key ];
 
                 if ( ! is_array( $eraser ) ) {
                         /* translators: %d: array index */
@@ -4614 +4616 @@
                         wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a friendly name.' ), $eraser_index ) );
                 }
 
-                $callback             = $erasers[ $index ]['callback'];
-                $eraser_friendly_name = $erasers[ $index ]['eraser_friendly_name'];
+                $callback             = $eraser['callback'];
+                $eraser_friendly_name = $eraser['eraser_friendly_name'];
 
                 $response = call_user_func( $callback, $email_address, $page );
 
@@ -4706 +4708 @@
          * @since 4.9.6
          *
          * @param array  $response        The personal data for the given exporter and page.
-         * @param int    $exporter_index  The index of the exporter that provided this data.
+         * @param int    $eraser_index    The index of the eraser that provided this data.
          * @param string $email_address   The email address associated with this personal data.
          * @param int    $page            The page for this response.
          * @param int    $request_id      The privacy request post ID associated with this request.
+         * @param int    $eraser_key      The key (slug) of the eraser that provided this data.
          */
-        $response = apply_filters( 'wp_privacy_personal_data_erasure_page', $response, $eraser_index, $email_address, $page, $request_id );
+        $response = apply_filters( 'wp_privacy_personal_data_erasure_page', $response, $eraser_index, $email_address, $page, $request_id, $eraser_key );
 
         if ( is_wp_error( $response ) ) {
                 wp_send_json_error( $response );

src/wp-admin/includes/file.php

@@ -2262 +2262 @@
  * @param int    $page            The page of personal data for this exporter. Begins at 1.
  * @param int    $request_id      The request ID for this personal data export.
  * @param bool   $send_as_email   Whether the final results of the export should be emailed to the user.
+ * @param string $exporter_key    The slug (key) of the exporter.
  * @return array The filtered response.
  */
-function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email ) {
+function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
         /* Do some simple checks on the shape of the response from the exporter.
          * If the exporter response is malformed, don't attempt to consume it - let it
          * pass through to generate a warning to the user by default ajax processing.

src/wp-includes/comment.php

@@ -3285 +3285 @@
  * @return array $exporters An array of personal data exporters.
  */
 function wp_register_comment_personal_data_exporter( $exporters ) {
-        $exporters[] = array(
+        $exporters['wordpress-comments'] = array(
                 'exporter_friendly_name' => __( 'WordPress Comments' ),
                 'callback'               => 'wp_comments_personal_data_exporter',
         );
@@ -3390 +3390 @@
  * @return array $erasers An array of personal data erasers.
  */
 function wp_register_comment_personal_data_eraser( $erasers ) {
-        $erasers[] = array(
+        $erasers['wordpress-comments'] = array(
                 'eraser_friendly_name' => __( 'WordPress Comments' ),
                 'callback'             => 'wp_comments_personal_data_eraser',
         );
@@ -3498 +3498 @@
                 'done'           => $done,
         );
 }
-

src/wp-includes/media.php

@@ -4102 +4102 @@
  * @return array  An array of personal data exporters.
  */
 function wp_register_media_personal_data_exporter( $exporters ) {
-        $exporters[] = array(
+        $exporters['wordpress-media'] = array(
                 'exporter_friendly_name' => __( 'WordPress Media' ),
                 'callback'               => 'wp_media_personal_data_exporter',
         );

src/wp-includes/user.php

@@ -2834 +2834 @@
  * @return array An array of personal data exporters.
  */
 function wp_register_user_personal_data_exporter( $exporters ) {
-        $exporters[] = array(
+        $exporters['wordpress-user'] = array(
                 'exporter_friendly_name' => __( 'WordPress User' ),
                 'callback'               => 'wp_user_personal_data_exporter',
         );