<!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] [3140] branches/1.2/bp-messages.php: Fixes #2068</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3140</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-07-21 19:02:03 +0000 (Wed, 21 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2068</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpmessagesphp">branches/1.2/bp-messages.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (3139 => 3140)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2010-07-21 18:48:57 UTC (rev 3139)
+++ branches/1.2/bp-messages.php 2010-07-21 19:02:03 UTC (rev 3140)
</span><span class="lines">@@ -419,14 +419,19 @@
</span><span class="cx"> $message->message = $content;
</span><span class="cx"> $message->date_sent = $date_sent;
</span><span class="cx">
</span><del>- /* If we have a thread ID, use the existing recipients, otherwise use the recipients passed */
</del><ins>+ // If we have a thread ID, use the existing recipients, otherwise use the recipients passed
</ins><span class="cx"> if ( $thread_id ) {
</span><span class="cx"> $thread = new BP_Messages_Thread( $thread_id );
</span><span class="cx"> $message->recipients = $thread->get_recipients();
</span><span class="cx">
</span><ins>+ // Strip the sender from the recipient list if they exist
+ if ( $key = array_search( $sender_id, $message->recipients ) )
+ unset( $message->recipients[$key] );
+
</ins><span class="cx"> if ( empty( $message->subject ) )
</span><span class="cx"> $message->subject = sprintf( __( 'Re: %s', 'buddypress' ), $thread->messages[0]->subject );
</span><span class="cx">
</span><ins>+ // No thread ID, so make some adjustments
</ins><span class="cx"> } else {
</span><span class="cx"> if ( empty( $recipients ) )
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>