Changeset 9838

Timestamp:

05/06/2015 04:04:09 AM (11 years ago)

Author:

r-a-y

Message:

bp-legacy: For AJAX private message reply, use the message loop.

When making a reply to a private message thread, our AJAX message output
should use the message loop and all related message template functions.

Previously, we did a workaround fix for zebra-striping (see r6548) and did
not use native template functions such as bp_the_thread_message_css_class()
(see r8604) or bp_the_thread_message_content() during AJAX.

Fixes #6321.

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (4 diffs)

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

@@ -1484 +1484 @@
         if ( !empty( $result ) ) {
 
-                // Get the zebra line classes correct on ajax requests
+                // pretend we're in the message loop
                 global $thread_template;
 
                 bp_thread_has_messages( array( 'thread_id' => (int) $_REQUEST['thread_id'] ) );
 
+                // set the current message to the 2nd last
+                $thread_template->message = end( $thread_template->thread->messages );
+                $thread_template->message = prev( $thread_template->thread->messages );
+
+                // set current message to current key
+                $thread_template->current_message = key( $thread_template->thread->messages );
+
+                // now manually iterate message like we're in the loop
                 bp_thread_the_message();
 
-                if ( $thread_template->message_count % 2 == 1 ) {
-                        $class = 'odd';
-                } else {
-                        $class = 'even alt';
-                } ?>
-
-                <div class="message-box new-message <?php echo $class; ?>">
+                // manually call oEmbed
+                // this is needed because we're not at the beginning of the loop
+                bp_messages_embed()
+        ?>
+
+                <div class="message-box new-message <?php bp_the_thread_message_css_class(); ?>">
                         <div class="message-metadata">
                                 <?php
 
                                 /**
-                                 * Fires before the notifications for private messages.
+                                 * Fires before the single message header is displayed.
                                  *
                                  * @since BuddyPress (1.1.0)
@@ -1514 +1521 @@
 
                                 /**
-                                 * Fires after the notifications for private messages.
+                                 * Fires after the single message header is displayed.
                                  *
                                  * @since BuddyPress (1.1.0)
@@ -1531 +1538 @@
 
                         <div class="message-content">
-                                <?php
-
-                                /** This filter is documented in bp-messages/bp-messages-template.php */
-                                echo stripslashes( apply_filters( 'bp_get_the_thread_message_content', $_REQUEST['content'] ) ); ?>
+                                <?php bp_the_thread_message_content(); ?>
                         </div>
 
@@ -1549 +1553 @@
                 </div>
         <?php
+                // clean up the loop
+                bp_thread_messages();
+
         } else {
                 echo "-1<div id='message' class='error'><p>" . __( 'There was a problem sending that reply. Please try again.', 'buddypress' ) . '</p></div>';