<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][10048] trunk/src/bp-templates/bp-legacy: bp-legacy: Introduce new template part - `/messages/message.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10048">10048</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10048","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-12 23:32:44 +0000 (Wed, 12 Aug 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/6572">#6572</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmemberssinglemessagessinglephp">trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressfunctionsphp">trunk/src/bp-templates/bp-legacy/buddypress-functions.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmemberssinglemessagesmessagephp">trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/message.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbplegacybuddypressmemberssinglemessagesmessagephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/message.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/message.php (rev 0)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/message.php 2015-08-12 23:32:44 UTC (rev 10048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,85 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * BuddyPress - Private Message Content.
+ *
+ * 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.
+ *
+ * @since 2.4.0
+ *
+ * @package BuddyPress
+ * @subpackage bp-legacy
+ */
+?>
+
+ <div class="message-box <?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 bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ); ?>
+
+ <?php if ( bp_get_the_thread_message_sender_link() ) : ?>
+
+ <strong><a href="<?php bp_the_thread_message_sender_link(); ?>" title="<?php bp_the_thread_message_sender_name(); ?>"><?php bp_the_thread_message_sender_name(); ?></a></strong>
+
+ <?php else : ?>
+
+ <strong><?php bp_the_thread_message_sender_name(); ?></strong>
+
+ <?php endif; ?>
+
+ <span class="activity"><?php bp_the_thread_message_time_since(); ?></span>
+
+ <?php if ( bp_is_active( 'messages', 'star' ) ) : ?>
+ <div class="message-star-actions">
+ <?php bp_the_message_star_action_link(); ?>
+ </div>
+ <?php endif; ?>
+
+ <?php
+
+ /**
+ * Fires after the single message header is displayed.
+ *
+ * @since BuddyPress (1.1.0)
+ */
+ do_action( 'bp_after_message_meta' ); ?>
+
+ </div><!-- .message-metadata -->
+
+ <?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><!-- .message-content -->
+
+ <?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><!-- .message-box -->
</ins></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmemberssinglemessagessinglephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php 2015-08-11 22:36:01 UTC (rev 10047)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/single/messages/single.php 2015-08-12 23:32:44 UTC (rev 10048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,63 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'bp_before_message_thread_list' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php while ( bp_thread_messages() ) : bp_thread_the_message(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- <div class="message-box <?php bp_the_thread_message_css_class(); ?>">
-
- <div class="message-metadata">
-
- <?php
-
- /** This action is documented in bp-templates/bp-legacy/buddypress-functions.php */
- do_action( 'bp_before_message_meta' ); ?>
-
- <?php bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ); ?>
-
- <?php if ( bp_get_the_thread_message_sender_link() ) : ?>
-
- <strong><a href="<?php bp_the_thread_message_sender_link(); ?>" title="<?php bp_the_thread_message_sender_name(); ?>"><?php bp_the_thread_message_sender_name(); ?></a></strong>
-
- <?php else : ?>
-
- <strong><?php bp_the_thread_message_sender_name(); ?></strong>
-
- <?php endif; ?>
-
- <span class="activity"><?php bp_the_thread_message_time_since(); ?></span>
-
- <?php if ( bp_is_active( 'messages', 'star' ) ) : ?>
- <div class="message-star-actions">
- <?php bp_the_message_star_action_link(); ?>
- </div>
- <?php endif; ?>
-
- <?php
-
- /** This action is documented in bp-templates/bp-legacy/buddypress-functions.php */
- do_action( 'bp_after_message_meta' ); ?>
-
- </div><!-- .message-metadata -->
-
- <?php
-
- /** This action is documented in bp-templates/bp-legacy/buddypress-functions.php */
- do_action( 'bp_before_message_content' ); ?>
-
- <div class="message-content">
-
- <?php bp_the_thread_message_content(); ?>
-
- </div><!-- .message-content -->
-
- <?php
-
- /** This action is documented in bp-templates/bp-legacy/buddypress-functions.php */
- do_action( 'bp_after_message_content' ); ?>
-
- <div class="clear"></div>
-
- </div><!-- .message-box -->
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php bp_get_template_part( 'members/single/messages/message' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endwhile; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-legacy/buddypress-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2015-08-11 22:36:01 UTC (rev 10047)
+++ trunk/src/bp-templates/bp-legacy/buddypress-functions.php 2015-08-12 23:32:44 UTC (rev 10048)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,58 +1540,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // manually call oEmbed
</span><span class="cx" style="display: block; padding: 0 10px"> // this is needed because we're not at the beginning of the loop
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_messages_embed()
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_messages_embed();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="message-box new-message <?php bp_the_thread_message_css_class(); ?>">
- <div class="message-metadata">
- <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // add new-message css class
+ add_filter( 'bp_get_the_thread_message_css_class', create_function( '$retval', '
+ $retval[] = "new-message";
+ return $retval;
+ ' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * 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' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // output single message template part
+ bp_get_template_part( 'members/single/messages/message' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <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
</del><span class="cx" style="display: block; padding: 0 10px"> // clean up the loop
</span><span class="cx" style="display: block; padding: 0 10px"> bp_thread_messages();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>