Changeset 43229

Timestamp:

05/10/2018 08:24:41 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Privacy: Avoid a PHP notice in wp_ajax_wp_privacy_erase_personal_data(), make sure $eraser_key is always defined.

Props allendav.
Merges [43228] to the 4.9 branch.
Fixes #44040.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/ajax-actions.php (modified) (4 diffs)

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

@@ -4167 +4167 @@
         } else {
                 // No exporters, so we're done.
+                $exporter_key = '';
+
                 $response = array(
                         'data' => array(),
@@ -4186 +4188 @@
          * @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.
+         * @param string $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, $exporter_key );
@@ -4383 +4385 @@
         } else {
                 // No erasers, so we're done.
+                $eraser_key = '';
+
                 $response = array(
                         'items_removed'  => false,
@@ -4403 +4407 @@
          * @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.
+         * @param string $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, $eraser_key );