Ticket #2732: 2732.2.diff

src/includes/replies/functions.php

@@ -302 +302 @@
 
         /** Reply Status **********************************************************/
 
-        // Maybe put into moderation
+        // Maybe put into moderation and set the menu_order to zero
         if ( !bbp_check_for_moderation( $anonymous_data, $reply_author, $reply_title, $reply_content ) ) {
                 $reply_status = bbp_get_pending_status_id();
+                $menu_order = 0;
 
         // Default
         } else {
                 $reply_status = bbp_get_public_status_id();
+                $menu_order = bbp_get_topic_reply_count( $topic_id, true ) + 1;
         }
 
         /** Reply To **************************************************************/
@@ -361 +363 @@
                 'post_parent'    => $topic_id,
                 'post_type'      => bbp_get_reply_post_type(),
                 'comment_status' => 'closed',
-                'menu_order'     => bbp_get_topic_reply_count( $topic_id, true ) + 1
+                'menu_order'     => $menu_order
         ) );
 
         // Insert reply
@@ -1860 +1862 @@
         // Set publish status
         $reply->post_status = bbp_get_public_status_id();
 
+        // Set the menu_order but only if going from original pending to publish, ie only if it has a menu_order == 0
+        if( $reply->menu_order == 0 ){
+                $topic_id = bbp_get_reply_topic_id( $reply->ID );
+                $reply->menu_order = bbp_get_topic_reply_count( $topic_id, true ) + 1;
+        }
+
         // No revisions
         remove_action( 'pre_post_update', 'wp_save_post_revision' );