Changeset 4525

Timestamp:

11/26/2012 05:46:05 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Supplemental update to bbp_trash_forum_topics(). See #2059.

File:

• trunk/includes/forums/functions.php (modified) (3 diffs)

trunk/includes/forums/functions.php

@@ -2001 +2001 @@
     ) );
 
-    // Forum is being trashed, so its topics are trashed too
-    if ( $topics = new WP_Query( array(
+    // Forum is being trashed, so its topics and replies are trashed too
+    $topics = new WP_Query( array(
         'suppress_filters' => true,
         'post_type'        => bbp_get_topic_post_type(),
@@ -2010 +2010 @@
         'nopaging'         => true,
         'fields'           => 'id=>parent'
-    ) ) ) {
+    ) );
+
+    // Loop through and trash child topics. Topic replies will get trashed by
+    // the bbp_trash_topic() action.
+    if ( !empty( $topics->posts ) ) {
 
         // Prevent debug notices
@@ -2029 +2033 @@
         wp_reset_postdata();
     }
+
+    // Cleanup
+    unset( $topics );
 }