Changeset 5404

Timestamp:

06/15/2014 03:42:58 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Correctly compare source & destination topic post_date values in bbp_merge_topic_handler(). Fixes issue where incorrect post would be updated when merging older topics into newer ones.

Also update the reply position for all newly relocated replies. Hat-tip netweb. Fixes #2528.

File:

• trunk/src/includes/topics/functions.php (modified) (2 diffs)

trunk/src/includes/topics/functions.php

@@ -1194 +1194 @@
 
     // Check if the destination topic is older than the source topic
-    if ( strtotime( $source_topic->post_date ) < strtotime( $destination_topic->post_date ) ) {
+    if ( strtotime( $destination_topic->post_date ) < strtotime( $source_topic->post_date ) ) {
 
         // Set destination topic post_date to 1 second before source topic
@@ -1296 +1296 @@
                 'post_type'   => bbp_get_reply_post_type(),
                 'post_parent' => $destination_topic->ID,
+                'menu_order'  => bbp_get_reply_position_raw( $reply->ID, $destination_topic->ID ),
                 'guid'        => ''
             ) );