Changeset 10048 for trunk/src/bp-templates/bp-legacy/buddypress-functions.php

Timestamp:

08/12/2015 11:32:44 PM (9 years ago)

Author:

r-a-y

Message:

bp-legacy: Introduce new template part - /messages/message.php.

This template is used in /messages/single.php during the message loop to
display each message and when a new message is created via AJAX.

This solves an issue where we were duplicating the message markup in two
different spots, which should make message template overrides easier.

Fixes #6572.

File:

• trunk/src/bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

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

@@ -1541 +1541 @@
         // 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 single message header is displayed.
-                 *
-                 * @since BuddyPress (1.1.0)
-                 */
-                do_action( 'bp_before_message_meta' ); ?>
-                <?php echo bp_loggedin_user_avatar( 'type=thumb&width=30&height=30' ); ?>
-
-                <strong><a href="<?php echo bp_loggedin_user_domain(); ?>"><?php bp_loggedin_user_fullname(); ?></a> <span class="activity"><?php printf( __( 'Sent %s', 'buddypress' ), bp_core_time_since( bp_core_current_time() ) ); ?></span></strong>
-
-                <?php
-
-                /**
-                 * Fires after the single message header is displayed.
-                 *
-                 * @since BuddyPress (1.1.0)
-                 */
-                do_action( 'bp_after_message_meta' ); ?>
-            </div>
-
-            <?php
-
-            /**
-             * Fires before the message content for a private message.
-             *
-             * @since BuddyPress (1.1.0)
-             */
-            do_action( 'bp_before_message_content' ); ?>
-
-            <div class="message-content">
-                <?php bp_the_thread_message_content(); ?>
-            </div>
-
-            <?php
-
-            /**
-             * Fires after the message content for a private message.
-             *
-             * @since BuddyPress (1.1.0)
-             */
-            do_action( 'bp_after_message_content' ); ?>
-
-            <div class="clear"></div>
-        </div>
-    <?php
+        bp_messages_embed();
+
+        // add new-message css class
+        add_filter( 'bp_get_the_thread_message_css_class', create_function( '$retval', '
+            $retval[] = "new-message";
+            return $retval;
+        ' ) );
+
+        // output single message template part
+        bp_get_template_part( 'members/single/messages/message' );
+
         // clean up the loop
         bp_thread_messages();