<!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][10038] trunk: `BP_Messages_Thread` objects should always have `last_message_*` properties set.</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/10038">10038</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/10038","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-08-07 14:07:41 +0000 (Fri, 07 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_Messages_Thread` objects should always have `last_message_*` properties set.
Previously, they were only set in the context of a template loop.
Props jdgrimes.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6580">#6580</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesbpmessagestemplatephp">trunk/src/bp-messages/bp-messages-template.php</a></li>
<li><a href="#trunksrcbpmessagesclassesclassbpmessagesthreadphp">trunk/src/bp-messages/classes/class-bp-messages-thread.php</a></li>
<li><a href="#trunktestsphpunittestcasesmessagesclassbpmessagesthreadphp">trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-template.php 2015-08-07 05:52:08 UTC (rev 10037)
+++ trunk/src/bp-messages/bp-messages-template.php 2015-08-07 14:07:41 UTC (rev 10038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,13 +1846,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct( $thread_id = 0, $order = 'ASC', $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->thread = new BP_Messages_Thread( $thread_id, $order, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->message_count = count( $this->thread->messages );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $last_message_index = $this->message_count - 1;
- $this->thread->last_message_id = $this->thread->messages[ $last_message_index ]->id;
- $this->thread->last_message_date = $this->thread->messages[ $last_message_index ]->date_sent;
- $this->thread->last_sender_id = $this->thread->messages[ $last_message_index ]->sender_id;
- $this->thread->last_message_subject = $this->thread->messages[ $last_message_index ]->subject;
- $this->thread->last_message_content = $this->thread->messages[ $last_message_index ]->message;
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpmessagesclassesclassbpmessagesthreadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/classes/class-bp-messages-thread.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/classes/class-bp-messages-thread.php 2015-08-07 05:52:08 UTC (rev 10037)
+++ trunk/src/bp-messages/classes/class-bp-messages-thread.php 2015-08-07 14:07:41 UTC (rev 10038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The current messages.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.0.0)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var object
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $messages;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The current recipients in the message thread.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.0.0)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @var object
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var array
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $recipients;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,6 +164,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->messages = array_reverse( $this->messages );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_message_index = count( $this->messages ) - 1;
+ $this->last_message_id = $this->messages[ $last_message_index ]->id;
+ $this->last_message_date = $this->messages[ $last_message_index ]->date_sent;
+ $this->last_sender_id = $this->messages[ $last_message_index ]->sender_id;
+ $this->last_message_subject = $this->messages[ $last_message_index ]->subject;
+ $this->last_message_content = $this->messages[ $last_message_index ]->message;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $this->messages as $key => $message ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sender_ids[ $message->sender_id ] = $message->sender_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasesmessagesclassbpmessagesthreadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php 2015-08-07 05:52:08 UTC (rev 10037)
+++ trunk/tests/phpunit/testcases/messages/class.bp-messages-thread.php 2015-08-07 14:07:41 UTC (rev 10038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,4 +402,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_is_valid_invalid_thread() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( null, BP_Messages_Thread::is_valid( 999 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @group last_message
+ */
+ public function test_last_message_populated() {
+ $u1 = $this->factory->user->create();
+ $u2 = $this->factory->user->create();
+
+ $date = bp_core_current_time();
+
+ $t1 = $this->factory->message->create( array(
+ 'sender_id' => $u1,
+ 'recipients' => array( $u2 ),
+ 'subject' => 'Foo',
+ 'date_sent' => $date,
+ 'content' => 'Bar and baz.',
+ ) );
+
+ $thread = new BP_Messages_Thread( $t1 );
+
+ $this->assertNotNull( $thread->last_message_id );
+ $this->assertEquals( 'Foo', $thread->last_message_subject );
+ $this->assertEquals( $u1, $thread->last_sender_id );
+ $this->assertEquals( $date, $thread->last_message_date );
+ $this->assertEquals( 'Bar and baz.', $thread->last_message_content );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>