Ticket #5990: 5990.01.patch

src/bp-messages/bp-messages-template.php

@@ -1834 +1834 @@
  * @todo Add Messages meta?
  */
 function bp_messages_embed() {
-        add_filter( 'embed_post_id', 'bp_get_message_thread_id' );
+        add_filter( 'embed_post_id', 'bp_get_the_thread_message_id' );
 }
-add_action( 'messages_box_loop_start', 'bp_messages_embed' );
+add_action( 'thread_loop_start', 'bp_messages_embed' );

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1298 +1298 @@
 
                 bp_thread_has_messages( array( 'thread_id' => (int) $_REQUEST['thread_id'] ) );
 
+                bp_thread_the_message();
+
                 if ( $thread_template->message_count % 2 == 1 ) {
                         $class = 'odd';
                 } else {