Changeset 3017

Timestamp:

04/22/2011 10:56:44 AM (14 years ago)

Author:

johnjamesjacoby

Message:

When merging two topics together, the destination topic post_date cannot be after the source topic or any merged replies. Fixes #1502. Props GautamGupta for original patch.

Location:

branches/plugin

Files:

• bbp-includes/bbp-topic-functions.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/bbpress/form-merge.php (modified) (2 diffs)
• bbp-themes/bbp-twentyten/bbpress/form-split.php (modified) (2 diffs)

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -677 +677 @@
             do_action( 'bbp_merge_topic', $destination_topic->ID, $source_topic->ID );
 
+            // Check if the destination topic is older than the source topic
+            if ( strtotime( $source_topic->post_date ) < strtotime( $destination_topic->post_date ) ) {
+
+                // Set destination topic post_date to 1 second before source topic
+                $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 )
+                );
+
+                // Update destination topic
+                wp_update_post( $postarr );
+            }
+
             // Remove the topic from everybody's subscriptions
             $subscribers = bbp_get_topic_subscribers( $source_topic->ID );

branches/plugin/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>
-                    </div>
-
-                    <div class="bbp-template-notice error">
-                        <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+                        <p><?php _e( '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. If the destination topic was created after this one, it\'s post date will be updated to second earlier than this one.', 'bbpress' ); ?></p>
                     </div>
 
@@ -83 +79 @@
                     </fieldset>
 
+                    <div class="bbp-template-notice error">
+                        <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+                    </div>
+
                     <div class="bbp-submit-wrapper">
                         <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>

branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-split.php

@@ -27 +27 @@
 
                     <div class="bbp-template-notice">
-                        <p><?php _e( '<strong>NOTE:</strong> If you use the existing topic option, 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>
-                    </div>
-
-                    <div class="bbp-template-notice error">
-                        <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+                        <p><?php _e( 'If you use the existing topic option, 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>
                     </div>
 
@@ -87 +83 @@
                     </fieldset>
 
+                    <div class="bbp-template-notice error">
+                        <p><?php _e( '<strong>WARNING:</strong> This process cannot be undone.', 'bbpress' ); ?></p>
+                    </div>
+
                     <div class="bbp-submit-wrapper">
                         <button type="submit" tabindex="<?php bbp_tab_index(); ?>" id="bbp_merge_topic_submit" name="bbp_merge_topic_submit"><?php _e( 'Submit', 'bbpress' ); ?></button>