Changeset 4524

Timestamp:

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

Author:

johnjamesjacoby

Message:

Deleting:

• When deleting a forum or topic, make sure all child content is deleted also.
• Also add some inline doc, and unset query variables, and clean up messy inline comparisons.
• Props MZAWeb.
• Fixes #2059.

Location:

trunk/includes

Files:

• forums/functions.php (modified) (2 diffs)
• topics/functions.php (modified) (5 diffs)

trunk/includes/forums/functions.php

@@ -1944 +1944 @@
         return;
 
-    // Forum is being permanently deleted, so its topics gotta go too
-    if ( $topics = new WP_Query( array(
+    // Forum is being permanently deleted, so its content has go too
+    // Note that we get all post statuses here
+    $topics = new WP_Query( array(
         'suppress_filters' => true,
         'post_type'        => bbp_get_topic_post_type(),
         'post_parent'      => $forum_id,
-        'post_status'      => 'any',
+        'post_status'      => array_keys( get_post_stati() ),
         'posts_per_page'   => -1,
         'nopaging'         => true,
         'fields'           => 'id=>parent'
-    ) ) ) {
+    ) );
+
+    // Loop through and delete child topics. Topic replies will get deleted by
+    // the bbp_delete_topic() action.
+    if ( !empty( $topics->posts ) ) {
         foreach ( $topics->posts as $topic ) {
             wp_delete_post( $topic->ID, true );
@@ -1961 +1966 @@
         wp_reset_postdata();
     }
+
+    // Cleanup
+    unset( $topics );
 }
 

trunk/includes/topics/functions.php

@@ -2935 +2935 @@
 
     // Topic is being permanently deleted, so its replies gotta go too
-    if ( $replies = new WP_Query( array(
+    // Note that we get all post statuses here
+    $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'
-    ) ) ) {
+    ) );
+
+    // Loop through and delete child replies
+    if ( ! empty( $replies->posts ) ) {
         foreach ( $replies->posts as $reply ) {
             wp_delete_post( $reply->ID, true );
@@ -2951 +2955 @@
         wp_reset_postdata();
     }
+
+    // Cleanup
+    unset( $replies );
 }
 
@@ -2977 +2984 @@
 
     // Topic is being trashed, so its replies are trashed too
-    if ( $replies = new WP_Query( array(
+    $replies = new WP_Query( array(
         'suppress_filters' => true,
         'post_type'        => bbp_get_reply_post_type(),
@@ -2985 +2992 @@
         'nopaging'         => true,
         'fields'           => 'id=>parent'
-    ) ) ) {
+    ) );
+
+    if ( !empty( $replies->posts ) ) {
 
         // Prevent debug notices
@@ -3004 +3013 @@
         wp_reset_postdata();
     }
+
+    // Cleanup
+    unset( $replies );
 }