Changeset 7526

Timestamp:

09/16/2026 06:34:30 AM (5 days ago)

Author:

johnjamesjacoby

Message:

Users: Preserve reply status when moderating users.

Process a user's replies before their topics when marking the user as spam or ham. Topic status helpers can transition child replies, so deterministic parent-last processing preserves each reply's stored status and keeps counts synchronized across database result orders.

In trunk, for 2.7.

See #3678.

Location:

trunk

Files:

• src/includes/users/capabilities.php (modified) (4 diffs)
• tests/phpunit/testcases/users/functions/counts.php (modified) (3 diffs)

trunk/src/includes/users/capabilities.php

@@ -607 +607 @@
         }
 
-        // Get array of post types to mark as spam
-        $post_types = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
-        $post_types = "'" . implode( "', '", $post_types ) . "'";
+        // Process replies before topics so topic status helpers run last
+        $post_types = array( bbp_get_reply_post_type(), bbp_get_topic_post_type() );
 
         // Get array of statuses to mark as spam
@@ -621 +620 @@
                 bbp_switch_to_site( $blog_id );
 
-                // Get topics and replies
-                $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status IN ( {$post_statuses} ) AND post_type IN ( {$post_types} )", $user_id );
-                $posts = $bbp_db->get_col( $query );
-
-                // Loop through posts and spam them
-                if ( ! empty( $posts ) ) {
-                        foreach ( $posts as $post_id ) {
-
-                                // The routines for topics ang replies are different, so use the
-                                // correct one based on the post type
-                                switch ( get_post_type( $post_id ) ) {
-
-                                        case bbp_get_topic_post_type() :
-                                                bbp_spam_topic( $post_id );
-                                                break;
-
-                                        case bbp_get_reply_post_type() :
-                                                bbp_spam_reply( $post_id );
-                                                break;
+                foreach ( $post_types as $post_type ) {
+
+                        // Get posts of this type
+                        $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status IN ( {$post_statuses} ) AND post_type = %s", $user_id, $post_type );
+                        $posts = $bbp_db->get_col( $query );
+
+                        // Loop through posts and spam them
+                        if ( ! empty( $posts ) ) {
+                                foreach ( $posts as $post_id ) {
+
+                                        // The routines for topics and replies are different, so use the
+                                        // correct one based on the post type
+                                        switch ( $post_type ) {
+
+                                                case bbp_get_topic_post_type() :
+                                                        bbp_spam_topic( $post_id );
+                                                        break;
+
+                                                case bbp_get_reply_post_type() :
+                                                        bbp_spam_reply( $post_id );
+                                                        break;
+                                        }
                                 }
                         }
@@ -692 +694 @@
         }
 
-        // Get array of post types to mark as spam
-        $post_types = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
-        $post_types = "'" . implode( "', '", $post_types ) . "'";
+        // Process replies before topics so topic status helpers run last
+        $post_types = array( bbp_get_reply_post_type(), bbp_get_topic_post_type() );
 
         // Get array of statuses to unmark as spam
@@ -706 +707 @@
                 bbp_switch_to_site( $blog_id );
 
-                // Get topics and replies
-                $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status IN ( {$post_statuses} ) AND post_type IN ( {$post_types} )", $user_id );
-                $posts = $bbp_db->get_col( $query );
-
-                // Loop through posts and spam them
-                if ( ! empty( $posts ) ) {
-                        foreach ( $posts as $post_id ) {
-
-                                // The routines for topics ang replies are different, so use the
-                                // correct one based on the post type
-                                switch ( get_post_type( $post_id ) ) {
-
-                                        case bbp_get_topic_post_type() :
-                                                bbp_unspam_topic( $post_id );
-                                                break;
-
-                                        case bbp_get_reply_post_type() :
-                                                bbp_unspam_reply( $post_id );
-                                                break;
+                foreach ( $post_types as $post_type ) {
+
+                        // Get posts of this type
+                        $query = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} WHERE post_author = %d AND post_status IN ( {$post_statuses} ) AND post_type = %s", $user_id, $post_type );
+                        $posts = $bbp_db->get_col( $query );
+
+                        // Loop through posts and unspam them
+                        if ( ! empty( $posts ) ) {
+                                foreach ( $posts as $post_id ) {
+
+                                        // The routines for topics and replies are different, so use the
+                                        // correct one based on the post type
+                                        switch ( $post_type ) {
+
+                                                case bbp_get_topic_post_type() :
+                                                        bbp_unspam_topic( $post_id );
+                                                        break;
+
+                                                case bbp_get_reply_post_type() :
+                                                        bbp_unspam_reply( $post_id );
+                                                        break;
+                                        }
                                 }
                         }

trunk/tests/phpunit/testcases/users/functions/counts.php

@@ -622 +622 @@
                         'topic_meta'  => array( 'forum_id' => $forum_id ),
                 ) );
-                $this->factory->reply->create( array(
+                $reply_id = $this->factory->reply->create( array(
                         'post_author' => $user_id,
                         'post_parent' => $topic_id,
@@ -632 +632 @@
 
                 $this->assertTrue( bbp_make_spam_user( $user_id ) );
+                $this->assertSame( bbp_get_spam_status_id(), get_post_status( $topic_id ) );
+                $this->assertSame( bbp_get_spam_status_id(), get_post_status( $reply_id ) );
                 $this->assertSame( 0, bbp_get_user_topic_count( $user_id, true ) );
                 $this->assertSame( 0, bbp_get_user_reply_count( $user_id, true ) );
@@ -640 +642 @@
 
                 $this->assertTrue( bbp_make_ham_user( $user_id ) );
+                $this->assertSame( bbp_get_public_status_id(), get_post_status( $topic_id ) );
+                $this->assertSame( bbp_get_public_status_id(), get_post_status( $reply_id ) );
                 $this->assertSame( 1, bbp_get_user_topic_count( $user_id, true ) );
                 $this->assertSame( 1, bbp_get_user_reply_count( $user_id, true ) );