Changeset 43061 for trunk/src/wp-includes/comment.php

Timestamp:

05/01/2018 07:26:53 PM (8 years ago)

Author:

azaozz

Message:

Privacy: improve wp_privacy_erase_personal_data(), return boolean values.

Props ericdaams.
See #43602.

File:

• trunk/src/wp-includes/comment.php (modified) (4 diffs)

trunk/src/wp-includes/comment.php

@@ -3413 +3413 @@
         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,
                 );
         }
 
         // Limit us to 500 comments at a time to avoid timing out.
-        $number            = 500;
-        $page              = (int) $page;
-        $num_items_removed = 0;
+        $number         = 500;
+        $page           = (int) $page;
+        $items_removed  = false;
+        $items_retained = false;
 
         $comments = get_comments(
@@ -3470 +3471 @@
                         }
 
+                        $items_retained = true;
+
                         continue;
                 }
@@ -3480 +3483 @@
 
                 if ( $updated ) {
-                        $num_items_removed++;
+                        $items_removed = true;
                         clean_comment_cache( $comment_id );
+                } else {
+                        $items_retained = true;
                 }
         }
@@ -3488 +3493 @@
 
         return array(
-                'num_items_removed'  => $num_items_removed,
-                'num_items_retained' => count( $comments ) - $num_items_removed,
-                'messages'           => $messages,
-                'done'               => $done,
+                'items_removed'  => $items_removed,
+                'items_retained' => $items_retained,
+                'messages'       => $messages,
+                'done'           => $done,
         );
 }
+