Ticket #2059: 2059.diff

includes/topics/functions.php

@@ -2933 +2933 @@
 
         do_action( 'bbp_delete_topic', $topic_id );
 
-        // Topic is being permanently deleted, so its replies gotta go too
-        if ( $replies = new WP_Query( array(
-                'suppress_filters' => true,
+        /*
+        * Topic is being permanently deleted, so its replies gotta go too.
+        * We want to delte _all_ replies, regardles of it's stati, and WP_Query's
+        * post_status=>any only gets posts which status is not marked as 'exclude_from_search'
+        * so posts in the trash, for example, were not beign deleted.
+        */
+        $replies = new WP_Query( array( 'suppress_filters' => true,
                 'post_type'        => bbp_get_reply_post_type(),
-                'post_status'      => 'any',
+                                        'post_status'      => array_keys( get_post_stati() ),
                 'post_parent'      => $topic_id,
                 'posts_per_page'   => -1,
                 'nopaging'         => true,
-                'fields'           => 'id=>parent'
-        ) ) ) {
+                                        'fields'           => 'id=>parent' ) );
+        if ( empty( $replies->posts ) )
+                return true;
+
                 foreach ( $replies->posts as $reply ) {
                         wp_delete_post( $reply->ID, true );
                 }
 
-                // Reset the $post global
                 wp_reset_postdata();
+
+        return true;
+
         }
-}
 
 /**
  * Called before trashing a topic