<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2401] trunk/bp-messages/bp-messages-templatetags.php:
  Fixes #1654</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2401</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-22 10:56:21 +0000 (Fri, 22 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #1654</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmessagesbpmessagestemplatetagsphp">trunk/bp-messages/bp-messages-templatetags.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmessagesbpmessagestemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-templatetags.php (2400 => 2401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-templatetags.php        2010-01-21 18:05:36 UTC (rev 2400)
+++ trunk/bp-messages/bp-messages-templatetags.php        2010-01-22 10:56:21 UTC (rev 2401)
</span><span class="lines">@@ -161,12 +161,6 @@
</span><span class="cx">         function bp_get_message_thread_id() {
</span><span class="cx">                 global $messages_template;
</span><span class="cx"> 
</span><del>-                /* Notice support */
-                if ( empty( $messages_template-&gt;thread-&gt;thread_id ) )
-                        $id = $messages_template-&gt;thread-&gt;id;
-                else
-                        $id = $messages_template-&gt;thread-&gt;thread_id;
-
</del><span class="cx">                 return apply_filters( 'bp_get_message_thread_id', $id );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -176,12 +170,6 @@
</span><span class="cx">         function bp_get_message_thread_subject() {
</span><span class="cx">                 global $messages_template;
</span><span class="cx"> 
</span><del>-                /* Notice support */
-                if ( empty( $messages_template-&gt;thread-&gt;last_message_subject ) )
-                        $subject = $messages_template-&gt;thread-&gt;subject;
-                else
-                        $subject = $messages_template-&gt;thread-&gt;last_message_subject;
-
</del><span class="cx">                 return apply_filters( 'bp_get_message_thread_subject', stripslashes_deep( $subject ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -191,12 +179,6 @@
</span><span class="cx">         function bp_get_message_thread_excerpt() {
</span><span class="cx">                 global $messages_template;
</span><span class="cx"> 
</span><del>-                /* Notice support */
-                if ( empty( $messages_template-&gt;thread-&gt;last_message_message ) )
-                        $message = $messages_template-&gt;thread-&gt;message;
-                else
-                        $message = $messages_template-&gt;thread-&gt;last_message_message;
-
</del><span class="cx">                 return apply_filters( 'bp_get_message_thread_excerpt', strip_tags( bp_create_excerpt( $message, 10 ) ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -206,12 +188,6 @@
</span><span class="cx">         function bp_get_message_thread_from() {
</span><span class="cx">                 global $messages_template, $bp;
</span><span class="cx"> 
</span><del>-                /* Notice support */
-                if ( empty( $messages_template-&gt;thread-&gt;last_sender_id ) )
-                        $sender = $bp-&gt;loggedin_user-&gt;id;
-                else
-                        $sender = $messages_template-&gt;thread-&gt;last_sender_id;
-
</del><span class="cx">                 return apply_filters( 'bp_get_message_thread_from', bp_core_get_userlink($sender) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -261,17 +237,11 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> function bp_message_thread_last_post_date() {
</span><del>-        echo bp_get_message_thread_last_post_date();
</del><ins>+        return bp_get_message_thread_last_post_date();
</ins><span class="cx"> }
</span><span class="cx">         function bp_get_message_thread_last_post_date() {
</span><span class="cx">                 global $messages_template;
</span><span class="cx"> 
</span><del>-                /* Notice support */
-                if ( empty( $messages_template-&gt;thread-&gt;last_post_date ) )
-                        $date = $messages_template-&gt;thread-&gt;date_sent;
-                else
-                        $date = $messages_template-&gt;thread-&gt;last_post_date;
-
</del><span class="cx">                 echo apply_filters( 'bp_get_message_thread_last_post_date', bp_format_time( strtotime($date) ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -281,12 +251,6 @@
</span><span class="cx">         function bp_get_message_thread_avatar() {
</span><span class="cx">                 global $messages_template, $bp;
</span><span class="cx"> 
</span><del>-                /* Notice support */
-                if ( empty( $messages_template-&gt;thread-&gt;last_sender_id ) )
-                        $sender = $bp-&gt;loggedin_user-&gt;id;
-                else
-                        $sender = $messages_template-&gt;thread-&gt;last_sender_id;
-
</del><span class="cx">                 echo apply_filters( 'bp_get_message_thread_avatar', bp_core_fetch_avatar( array( 'item_id' =&gt; $sender, 'type' =&gt; 'thumb' ) ) );
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>