<!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] [2502] trunk:
Messaging sentbox fix and various other minor fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2502</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-31 20:08:28 +0000 (Sun, 31 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Messaging sentbox fix and various other minor fixes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesclassesphp">trunk/bp-messages/bp-messages-classes.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglemessagesmessagesloopphp">trunk/bp-themes/bp-default/members/single/messages/messages-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2501 => 2502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-01-31 17:25:57 UTC (rev 2501)
+++ trunk/bp-activity/bp-activity-classes.php 2010-01-31 20:08:28 UTC (rev 2502)
</span><span class="lines">@@ -26,8 +26,7 @@
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $row = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id = %d", $this->id ) );
</span><del>-
- if ( $activity ) {
</del><ins>+ if ( $row ) {
</ins><span class="cx"> $this->id = $row->id;
</span><span class="cx"> $this->item_id = $row->item_id;
</span><span class="cx"> $this->secondary_item_id = $row->secondary_item_id;
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2501 => 2502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-01-31 17:25:57 UTC (rev 2501)
+++ trunk/bp-activity.php 2010-01-31 20:08:28 UTC (rev 2502)
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx">
</span><span class="cx"> /* Send an email notification if settings allow */
</span><span class="cx"> require_once( BP_PLUGIN_DIR . '/bp-activity/bp-activity-notifications.php' );
</span><del>- bp_activity_new_comment_notification( $comment_id, $params );
</del><ins>+ bp_activity_new_comment_notification( $comment_id, $user_id, $params );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_activity_comment_posted', $comment_id, $params );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (2501 => 2502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2010-01-31 17:25:57 UTC (rev 2501)
+++ trunk/bp-groups/bp-groups-notifications.php 2010-01-31 20:08:28 UTC (rev 2502)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> // Now email the user with the contents of the message (if they have enabled email notifications)
</span><del>- if ( !get_usermeta( $user_id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
</del><ins>+ if ( 'no' != get_usermeta( $user_id, 'notification_activity_new_mention' ) ) {
</ins><span class="cx"> $poster_name = bp_core_get_user_displayname( $poster_user_id );
</span><span class="cx">
</span><span class="cx"> $message_link = bp_activity_get_permalink( $activity_id );
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-classes.php (2501 => 2502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-classes.php 2010-01-31 17:25:57 UTC (rev 2501)
+++ trunk/bp-messages/bp-messages-classes.php 2010-01-31 20:08:28 UTC (rev 2502)
</span><span class="lines">@@ -190,10 +190,10 @@
</span><span class="cx">
</span><span class="cx"> function get_recipient_links($recipients) {
</span><span class="cx"> if ( count($recipients) >= 5 )
</span><del>- return count($recipients) . __(' Recipients', 'buddypress');
</del><ins>+ return count( $recipients ) . __(' Recipients', 'buddypress');
</ins><span class="cx">
</span><del>- for ( $i = 0; $i < count($recipients); $i++ ) {
- $recipient_links[] = bp_core_get_userlink( $recipients[$i] );
</del><ins>+ foreach ( $recipients as $recipient ) {
+ $recipient_links[] = bp_core_get_userlink( $recipient->user_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return implode( ', ', (array) $recipient_links );
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglemessagesmessagesloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/messages/messages-loop.php (2501 => 2502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/messages/messages-loop.php 2010-01-31 17:25:57 UTC (rev 2501)
+++ trunk/bp-themes/bp-default/members/single/messages/messages-loop.php 2010-01-31 20:08:28 UTC (rev 2502)
</span><span class="lines">@@ -25,10 +25,19 @@
</span><span class="cx"> <span class="unread-count"><?php bp_message_thread_unread_count() ?></span>
</span><span class="cx"> </td>
</span><span class="cx"> <td width="1%" class="thread-avatar"><?php bp_message_thread_avatar() ?></td>
</span><del>- <td width="30%" class="thread-from">
- <?php _e( 'From:', 'buddypress' ); ?> <?php bp_message_thread_from() ?><br />
- <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
- </td>
</del><ins>+
+ <?php if ( 'sentbox' != bp_current_action() ) : ?>
+ <td width="30%" class="thread-from">
+ <?php _e( 'From:', 'buddypress' ); ?> <?php bp_message_thread_from() ?><br />
+ <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
+ </td>
+ <?php else: ?>
+ <td width="30%" class="thread-from">
+ <?php _e( 'To:', 'buddypress' ); ?> <?php bp_message_thread_to() ?><br />
+ <span class="activity"><?php bp_message_thread_last_post_date() ?></span>
+ </td>
+ <?php endif; ?>
+
</ins><span class="cx"> <td width="50%" class="thread-info">
</span><span class="cx"> <p><a href="<?php bp_message_thread_view_link() ?>" title="<?php _e( "View Message", "buddypress" ); ?>"><?php bp_message_thread_subject() ?></a></p>
</span><span class="cx"> <p class="thread-excerpt"><?php bp_message_thread_excerpt() ?></p>
</span></span></pre>
</div>
</div>
</body>
</html>