Ticket #1502: topic_merge.diff

bbp-includes/bbp-topic-functions.php

@@ -676 +676 @@
                         // Update counts, etc...
                         do_action( 'bbp_merge_topic', $destination_topic->ID, $source_topic->ID );
 
+                        // Check if the post date of the source topic is earlier than that of destination topic
+                        if ( strtotime( $source_topic->post_date ) < strtotime( $destination_topic->post_date ) ) {
+
+                                // If that's the case then revert back the date of the destination topic
+                                // So that the topic is displayed before anything
+                                $destination_post_date = date( 'Y-m-d H:i:s', strtotime( $source_topic->post_date ) - 1 );
+
+                                $postarr = array(
+                                        'ID'            => $destination_topic_id,
+                                        'post_date'     => $destination_post_date,
+                                        'post_date_gmt' => get_gmt_from_date( $destination_post_date )
+                                );
+
+                                wp_update_post( $postarr );
+                        }
+
                         // Remove the topic from everybody's subscriptions
                         $subscribers = bbp_get_topic_subscribers( $source_topic->ID );
                         foreach ( (array) $subscribers as $subscriber ) {

bbp-themes/bbp-twentyten/bbpress/form-merge.php

@@ -28 +28 @@
 
                                         <div class="bbp-template-notice">
                                                 <p><?php _e( '<strong>NOTE:</strong> All replies within both topics will be merged chronologically. The order of the merged replies is based on the time and date they were posted.', 'bbpress' ); ?></p>
+                                                <p><?php _e( 'Also note that if this topic was created before the destination topic, then the destination topic\'s post date would be changed to a second before this topic\'s date. ', 'bbpress' ); ?></p>
                                         </div>
 
                                         <div class="bbp-template-notice error">