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

Timestamp:

05/02/2018 03:43:37 AM (7 years ago)

Author:

SergeyBiryukov

Message:

Privacy: improve wp_privacy_erase_personal_data(), return boolean values.

Props ericdaams.
Merges [43061] to the 4.9 branch.
See #43602.

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

@@ -4256 +4256 @@
      *
      *         @type string $callback               Callable eraser that accepts an email address and
-     *                                              a page and returns an array with the number of items
-     *                                              removed, the number of items retained and any messages
+     *                                              a page and returns an array with boolean values for
+     *                                              whether items were removed or retained and any messages
      *                                              from the eraser, as well as if additional pages are
      *                                              available.
@@ -4324 +4324 @@
         }
 
-        if ( ! array_key_exists( 'num_items_removed', $response ) ) {
+        if ( ! array_key_exists( 'items_removed', $response ) ) {
             wp_send_json_error(
                 sprintf(
                     /* translators: 1: eraser friendly name, 2: array index */
-                    __( 'Expected num_items_removed key in response array from %1$s eraser (index %2$d).' ),
+                    __( 'Expected items_removed key in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
                     $eraser_index
@@ -4335 +4335 @@
         }
 
-        if ( ! array_key_exists( 'num_items_retained', $response ) ) {
+        if ( ! array_key_exists( 'items_retained', $response ) ) {
             wp_send_json_error(
                 sprintf(
                     /* translators: 1: eraser friendly name, 2: array index */
-                    __( 'Expected num_items_retained key in response array from %1$s eraser (index %2$d).' ),
+                    __( 'Expected items_retained key in response array from %1$s eraser (index %2$d).' ),
                     esc_html( $eraser_friendly_name ),
                     $eraser_index
@@ -4381 +4381 @@
         // No erasers, so we're done.
         $response = array(
-            'num_items_removed'  => 0,
-            'num_items_retained' => 0,
-            'messages'           => array(),
-            'done'               => true,
+            'items_removed'  => false,
+            'items_retained' => false,
+            'messages'       => array(),
+            'done'           => true,
         );
     }