Changeset 13995 for trunk/wp-includes/comment.php

Timestamp:

04/04/2010 12:20:19 PM (15 years ago)

Author:

nacin

Message:

Add $force_delete to wp_delete_comment(). see #12766, see #11470.

File:

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

trunk/wp-includes/comment.php

@@ -857 +857 @@
 
 /**
- * Removes comment ID and maybe updates post comment count.
+ * Trashes or deletes a comment.
+ *
+ * The comment is moved to trash instead of permanently deleted unless trash is
+ * disabled, item is already in the trash, or $force_delete is true.
  *
  * The post comment count will be updated if the comment was approved and has a
@@ -870 +873 @@
  *
  * @param int $comment_id Comment ID
+ * @param bool $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return bool False if delete comment query failure, true on success.
  */
-function wp_delete_comment($comment_id) {
+function wp_delete_comment($comment_id, $force_delete = false) {
     global $wpdb;
     if (!$comment = get_comment($comment_id))
         return false;
 
-    if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
+    if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status($comment_id), array( 'trash', 'spam' ) ) )
         return wp_trash_comment($comment_id);
 
@@ -916 +920 @@
  * Moves a comment to the Trash
  *
+ * If trash is disabled, comment is permanently deleted.
+ *
  * @since 2.9.0
  * @uses do_action() on 'trash_comment' before trashing
  * @uses do_action() on 'trashed_comment' after trashing
+ * @uses wp_delete_comment() if trash is disabled
  *
  * @param int $comment_id Comment ID.
@@ -924 +931 @@
  */
 function wp_trash_comment($comment_id) {
-    if ( EMPTY_TRASH_DAYS == 0 )
-        return wp_delete_comment($comment_id);
+    if ( !EMPTY_TRASH_DAYS )
+        return wp_delete_comment($comment_id, true);
 
     if ( !$comment = get_comment($comment_id) )