Changeset 8038

Timestamp:

10/15/2026 11:08:10 PM (10 days ago)

Author:

johnjamesjacoby

Message:

Moderation: Preserve pending post dates.

Set the GMT date when WordPress inserts pending topics and replies so later status-only updates do not replace the original post date. This moves the WordPress.org safeguard into bbPress and keeps REST editing behavior consistent with the stored date invariant.

Add regression coverage for topic and reply status changes and update the existing REST expectations.

In branches/2.6, for 2.6.21.

Fixes #3744.

Location:

branches/2.6

Files:

• CHANGELOG.md (modified) (1 diff)
• src/includes/common/functions.php (modified) (1 diff)
• src/includes/core/filters.php (modified) (1 diff)
• tests/phpunit/testcases/common/functions.php (modified) (1 diff)
• tests/phpunit/testcases/common/rest.php (modified) (3 diffs)

branches/2.6/CHANGELOG.md

@@ -13 +13 @@
 Development for the next bbPress release is in progress. See the active
 [Trac milestones](https://bbpress.trac.wordpress.org/roadmap) for planned work.
+
+### Fixed
+
+- Preserved the original date of pending topics and replies across status changes.
 
 ## 2.6.20 - 2026-10-15

branches/2.6/src/includes/common/functions.php

@@ -262 +262 @@
 
         return $retval;
+}
+
+/**
+ * Set the GMT date for pending topics and replies.
+ *
+ * WordPress leaves the GMT date empty for pending posts, which can cause a
+ * later status change to replace the original post date.
+ *
+ * @since 2.6.21 bbPress
+ *
+ * @param array $data Post data
+ * @return array Filtered post data
+ */
+function bbp_set_pending_post_date_gmt( $data = array() ) {
+        if (
+                isset( $data['post_type'], $data['post_status'], $data['post_date'], $data['post_date_gmt'] )
+                && in_array( $data['post_type'], array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ), true )
+                && ( bbp_get_pending_status_id() === $data['post_status'] )
+                && ( '0000-00-00 00:00:00' === $data['post_date_gmt'] )
+        ) {
+                $data['post_date_gmt'] = get_gmt_from_date( $data['post_date'] );
+        }
+
+        return $data;
 }
 

branches/2.6/src/includes/core/filters.php

@@ -59 +59 @@
 add_filter( 'rest_request_before_callbacks', 'bbp_filter_rest_user_discovery',          10, 3 );
 
-// Filter WordPress post data for forums and anonymous posts
+// Filter WordPress post data for forums, pending dates, and anonymous posts
 add_filter( 'wp_insert_post_data', 'bbp_filter_admin_forum_post_data', 20, 2 );
+add_filter( 'wp_insert_post_data', 'bbp_set_pending_post_date_gmt',     25    );
 add_filter( 'wp_insert_post_data', 'bbp_fix_post_author',              30, 2 );
 

branches/2.6/tests/phpunit/testcases/common/functions.php

@@ -635 +635 @@
                         'This test has not been implemented yet.'
                 );
+        }
+
+        /**
+         * @covers ::bbp_set_pending_post_date_gmt
+         */
+        public function test_bbp_set_pending_post_date_gmt_preserves_dates_on_status_change() {
+                $forum_id = $this->factory->forum->create();
+                $topic_id = $this->factory->topic->create( array(
+                        'post_parent' => $forum_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                        'post_date'   => '2020-01-01 00:00:00',
+                        'topic_meta'  => array( 'forum_id' => $forum_id ),
+                ) );
+                $reply_id = $this->factory->reply->create( array(
+                        'post_parent' => $topic_id,
+                        'post_status' => bbp_get_pending_status_id(),
+                        'post_date'   => '2020-01-02 00:00:00',
+                        'reply_meta'  => array(
+                                'forum_id' => $forum_id,
+                                'topic_id' => $topic_id,
+                        ),
+                ) );
+
+                foreach ( array( $topic_id, $reply_id ) as $post_id ) {
+                        $post_date = get_post_field( 'post_date', $post_id );
+                        $this->assertSame( get_gmt_from_date( $post_date ), get_post_field( 'post_date_gmt', $post_id ) );
+
+                        wp_update_post( array(
+                                'ID'          => $post_id,
+                                'post_status' => bbp_get_spam_status_id(),
+                        ) );
+
+                        $this->assertSame( $post_date, get_post_field( 'post_date', $post_id ) );
+                }
         }
 

branches/2.6/tests/phpunit/testcases/common/rest.php

@@ -1095 +1095 @@
 
         /**
-         * A pending topic's zero GMT date must not lock out its recent author.
+         * A pending topic's GMT date must not lock out its recent author.
          *
          * @covers BBP_REST_Posts_Controller::update_item_permissions_check
@@ -1108 +1108 @@
                 bbp_set_user_role( $user_id, bbp_get_participant_role() );
 
-                $this->assertSame( '0000-00-00 00:00:00', get_post_field( 'post_date_gmt', $topic_id ) );
+                $this->assertSame( get_gmt_from_date( get_post_field( 'post_date', $topic_id ) ), get_post_field( 'post_date_gmt', $topic_id ) );
                 $response = $this->update_item( bbp_get_topic_post_type(), $topic_id, $user_id, array( 'content' => 'Pending revision.' ) );
 
@@ -1194 +1194 @@
                 bbp_set_user_role( $user_id, bbp_get_participant_role() );
 
-                $this->assertSame( '0000-00-00 00:00:00', get_post_field( 'post_date_gmt', $reply_id ) );
+                $this->assertSame( get_gmt_from_date( get_post_field( 'post_date', $reply_id ) ), get_post_field( 'post_date_gmt', $reply_id ) );
                 $response = $this->update_item( bbp_get_reply_post_type(), $reply_id, $user_id, array( 'content' => 'Pending reply revision.' ) );