Ticket #37703: 37703.1.patch

src/wp-includes/comment.php

@@ -1376 +1376 @@
  *
  * @param int|WP_Comment $comment_id   Comment ID or WP_Comment object.
  * @param bool           $force_delete Whether to bypass trash and force deletion. Default is false.
+ * @param bool           $bulk         Some behaviours are delegate to the bulk function wp_delete_comments. Default is false.
  * @return bool True on success, false on failure.
  */
-function wp_delete_comment( $comment_id, $force_delete = false ) {
+function wp_delete_comment( $comment_id, $force_delete = false, $bulk = false ) {
         global $wpdb;
         $comment = get_comment( $comment_id );
         if ( ! $comment ) {
@@ -1400 +1401 @@
          */
         do_action( 'delete_comment', $comment->comment_ID, $comment );
 
-        // Move children up a level.
-        $children = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID ) );
-        if ( ! empty( $children ) ) {
-                $wpdb->update( $wpdb->comments, array( 'comment_parent' => $comment->comment_parent ), array( 'comment_parent' => $comment->comment_ID ) );
-                clean_comment_cache( $children );
+        if ( !$bulk ) {
+                wp_reparentering_comment( $comment->comment_ID, $comment->comment_parent );
         }
 
         // Delete metadata
@@ -1442 +1440 @@
         return true;
 }
 
+/**
+ * Assign a new parent to a comment
+ *
+ * The comment get a new parent and the comment cache is cleaned.
+ *
+ * @since x.x.x
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param string|Array $comment_id     Comment ID.
+ * @param string       $comment_parent Comment parent ID.
+ * @param array        $has_children   Pass children or find automatically. Default is false.
+ * @return bool True on success, false on failure.
+ */
+function wp_reparentering_comment( $comment_ID, $comment_parent, $has_children = false ) {
+        global $wpdb;
+        $data = array( 'comment_parent' => $comment_parent );
+        $where = array( 'comment_parent' => $comment_ID );
+        // Move children up a level.
+        if ( !$has_children ) {
+                $children = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment_ID ) );
+                if ( ! empty( $children ) ) {
+                        clean_comment_cache( $children );
+                }
+        }
+
+        $wpdb->update( $wpdb->comments, $data, $where );
+
+        return true;
+}
+
+/**
+ * Trashes or deletes comments.
+ *
+ * The comments are 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 comments were approved and have a
+ * post ID available.
+ *
+ * @since x.x.x
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param array $comments_id   Comment ID or WP_Comment object.
+ * @param bool  $force_delete Whether to bypass trash and force deletion. Default is false.
+ * @return bool True on success, false on failure.
+ */
+function wp_delete_comments( $comments_id, $force_delete = false ) {
+        global $wpdb;
+        $look_for_grandparents = array();
+        $look_for_ancestors = array();
+        if ( empty( $comments_id ) ) {
+                return true;
+        }
+
+        $comments_string = '(' . implode( ",", array_map( 'intval', $comments_id ) ) . ')';
+        // Determine if a parent comment is being deleted from a comment that is not being deleted
+        $look_for_parents = $wpdb->get_results( "SELECT comment_ID, comment_parent FROM $wpdb->comments WHERE comment_parent IN $comments_string AND comment_ID NOT IN $comments_string" , ARRAY_N);
+        // Determine grandparents
+        if ( !empty( $look_for_parents ) ) {
+                $parents_to_delete = array_map( function ( $a ) { return intval( $a[1] ); }, $look_for_parents );
+                $parents_string = '(' . implode( ",", $parents_to_delete ) . ')';
+                $look_for_grandparents = $wpdb->get_results( "SELECT comment_ID, comment_parent FROM $wpdb->comments WHERE comment_ID IN $parents_string", ARRAY_N );
+                // Determine very old ancestors
+                if ( !empty( $look_for_grandparents ) ) {
+                        foreach( $look_for_grandparents as $comment ) {
+                                wp_reparentering_comment( $comment[ 0 ], $comment[ 1 ], true );
+                        }
+                        $grandparents_to_delete = array_map( function ( $a ) { return intval( $a[1] ); }, $look_for_grandparents );
+                        $grandparents_string = '(' . implode( ",", $grandparents_to_delete ) . ')';
+                        $look_for_ancestors = $wpdb->get_results( "SELECT comment_ID, comment_parent FROM $wpdb->comments WHERE comment_ID IN $grandparents_string", ARRAY_N );
+                        foreach( $look_for_ancestors as $comment ) {
+                                wp_reparentering_comment( $comment[ 0 ], $comment[ 1 ], true );
+                        }
+                }
+        }
+
+        foreach ( $comments_id as $comment_id ) {
+                $single_comment = wp_delete_comment( $comment_id, $force_delete, true );
+                if ( !$single_comment ) {
+                        return false;
+                }
+        }
+
+        /**
+         * Fires immediately after comments are deleted from the database.
+         *
+         * @since x.x.x
+         *
+         * @param int        $comment_id The comment ID.
+         */
+        do_action( 'deleted_comments', $comments_id );
+        return true;
+}
+
 /**
  * Moves a comment to the Trash
  *

src/wp-includes/post.php

@@ -3003 +3003 @@
 
         wp_defer_comment_counting( true );
 
-        $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ) );
-        foreach ( $comment_ids as $comment_id ) {
-                wp_delete_comment( $comment_id, true );
-        }
+        $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d ORDER BY comment_ID DESC", $postid ) );
+        wp_delete_comments( $comment_ids, true );
 
         wp_defer_comment_counting( false );
 
@@ -5610 +5608 @@
         wp_defer_comment_counting( true );
 
         $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ) );
-        foreach ( $comment_ids as $comment_id ) {
-                wp_delete_comment( $comment_id, true );
-        }
+        wp_delete_comments( $comment_ids, true );
 
         wp_defer_comment_counting( false );
 

tests/phpunit/tests/comment/query.php

@@ -4381 +4381 @@
                 $this->assertEqualSets( array( $c ), $found );
         }
 
+        /**
+         * @ticket 37703
+         */
+        public function test_delete_comments() {
+                $parent1 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                        )
+                );
+
+                $parent2 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $parent1,
+                        )
+                );
+
+                $c1 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $parent2,
+                        )
+                );
+
+                $c2 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $parent2,
+                        )
+                );
+
+                $c3 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $c2,
+                        )
+                );
+
+                $parent3 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                        )
+                );
+
+                $c4 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $parent3,
+                        )
+                );
+
+                self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $c4,
+                        )
+                );
+
+                $c5 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                        )
+                );
+
+                self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $c5,
+                        )
+                );
+
+                $c6 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                        )
+                );
+
+                $c7 = self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $c6,
+                        )
+                );
+
+                self::factory()->comment->create(
+                        array(
+                                'comment_post_ID'  => self::$post_id,
+                                'comment_approved' => '1',
+                                'comment_parent'   => $c7,
+                        )
+                );
+
+                $this->assertTrue( wp_delete_comments( array( $c1, $c2, $c3, $c4, $c5, $c6, $c7 ) ) );
+        }
+
         public function test_comment_query_should_be_cached() {
                 global $wpdb;