Ticket #43602: 43602.6.diff

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

@@ -4486 +4486 @@
          *     An array of callable erasers of personal data. Default empty array.
          *     [
          *         callback             string 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.
          *         eraser_friendly_name string Translated user facing friendly name for the eraser.
@@ -4562 +4562 @@
                                 )
                         );
                 }
-                if ( ! array_key_exists( 'num_items_removed', $response ) ) {
+                if ( ! array_key_exists( 'items_removed', $response ) ) {
                         wp_send_json_error(
                                 sprintf(
-                                        __( 'Error: Expected num_items_removed key in response array from %s eraser (index %d).' ),
+                                        __( 'Error: Expected items_removed key in response array from %s eraser (index %d).' ),
                                         $eraser_friendly_name,
                                         $eraser_index
                                 )
                         );
                 }
-                if ( ! array_key_exists( 'num_items_retained', $response ) ) {
+                if ( ! array_key_exists( 'items_retained', $response ) ) {
                         wp_send_json_error(
                                 sprintf(
-                                        __( 'Error: Expected num_items_retained key in response array from %s eraser (index %d).' ),
+                                        __( 'Error: Expected items_retained key in response array from %s eraser (index %d).' ),
                                         $eraser_friendly_name,
                                         $eraser_index
                                 )
@@ -4610 +4610 @@
         } else {
                 // 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,
                 );
         }
 

src/wp-admin/js/xfn.js

@@ -61 +61 @@
                 var nonce         = $action.data( 'nonce' );
                 var erasersCount  = $action.data( 'erasers-count' );
 
-                var removedCount  = 0;
-                var retainedCount = 0;
+                var hasRemoved    = false;
+                var hasRetained   = false;
                 var messages      = [];
 
                 $action.blur();
@@ -72 +72 @@
                         set_action_state( $action, 'remove_personal_data_idle' );
                         var summaryMessage = strings.noDataFound;
                         var classes = 'notice-success';
-                        if ( 0 === removedCount ) {
-                                if ( 0 === retainedCount ) {
+                        if ( false === hasRemoved ) {
+                                if ( false === hasRetained ) {
                                         summaryMessage = strings.noDataFound;
                                 } else {
                                         summaryMessage = strings.noneRemoved;
                                         classes = 'notice-warning';
                                 }
                         } else {
-                                if ( 0 === retainedCount ) {
+                                if ( false === hasRetained ) {
                                         summaryMessage = strings.foundAndRemoved;
                                 } else {
                                         summaryMessage = strings.someNotRemoved;
@@ -112 +112 @@
                                         return;
                                 }
                                 var responseData = response.data;
-                                if ( responseData.num_items_removed ) {
-                                        removedCount += responseData.num_items_removed;
+                                if ( responseData.items_removed ) {
+                                        hasRemoved = hasRemoved || responseData.items_removed;
                                 }
-                                if ( responseData.num_items_retained ) {
-                                        retainedCount += responseData.num_items_removed;
+                                if ( responseData.items_retained ) {
+                                        hasRetained = hasRetained || responseData.items_retained;
                                 }
                                 if ( responseData.messages ) {
                                         messages = messages.concat( responseData.messages );

src/wp-includes/comment.php

@@ -3410 +3410 @@
 
         if ( empty( $email_address ) ) {
                 return array(
-                        'num_items_removed'  => 0,
-                        'num_items_retained' => 0,
-                        'messages'           => array(),
-                        'done'               => true,
+                        'items_removed'  => false,
+                        'items_retained' => false,
+                        'messages'       => array(),
+                        'done'           => true,
                 );
         }
 
@@ -3477 +3477 @@
                 $updated = $wpdb->update( $wpdb->comments, $anonymized_comment, $args );
 
                 if ( $updated ) {
-                        $num_items_removed++;
+                        $num_items_removed += 1;
                         clean_comment_cache( $comment_id );
                 }
         }
@@ -3485 +3485 @@
         $done = count( $comments ) < $number;
 
         return array(
-                'num_items_removed'  => $num_items_removed,
-                'num_items_retained' => count( $comments ) - $num_items_removed,
-                'messages'           => $messages,
-                'done'               => $done,
+                'items_removed'  => 0 < $num_items_removed,
+                'items_retained' => count( $comments ) > $num_items_removed,
+                'messages'       => $messages,
+                'done'           => $done,
         );
 }