Changeset 43110 for branches/4.9/src/wp-includes/comment.php

Timestamp:

05/02/2018 03:43:37 AM (6 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-includes/comment.php (modified) (4 diffs)

branches/4.9/src/wp-includes/comment.php

@@ -3283 +3283 @@
     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(
@@ -3340 +3341 @@
             }
 
+            $items_retained = true;
+
             continue;
         }
@@ -3350 +3353 @@
 
         if ( $updated ) {
-            $num_items_removed++;
+            $items_removed = true;
             clean_comment_cache( $comment_id );
+        } else {
+            $items_retained = true;
         }
     }
@@ -3358 +3363 @@
 
     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,
     );
 }
+