<!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] [1814] trunk: Fixing the double "You"
problem on activity items that contain users that have the same name.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1814</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-07 19:51:46 +0000 (Mon, 07 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixing the double "You" problem on activity items that contain users that have the same name. Fixes #915</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (1813 => 1814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2009-09-07 19:37:50 UTC (rev 1813)
+++ trunk/bp-activity/bp-activity-templatetags.php 2009-09-07 19:51:46 UTC (rev 1814)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> /* Remove the 'You' and replace if with the persons name */
</span><span class="cx"> if ( $filter_you && $full_name != '' ) {
</span><del>- $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0] );
</del><ins>+ $content[0] = preg_replace( "/{$full_name}[<]/", 'You<', $content[0], 1 );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (1813 => 1814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2009-09-07 19:37:50 UTC (rev 1813)
+++ trunk/bp-friends.php 2009-09-07 19:51:46 UTC (rev 1814)
</span><span class="lines">@@ -638,6 +638,8 @@
</span><span class="cx"> 'primary_link' => $primary_link,
</span><span class="cx"> 'item_id' => $friendship_id
</span><span class="cx"> ) );
</span><ins>+
+ $activity_content = apply_filters( 'bp_friends_friendship_accepted_activity', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship );
</ins><span class="cx">
</span><span class="cx"> /* Record in activity streams for the friend */
</span><span class="cx"> friends_record_activity( array(
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (1813 => 1814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2009-09-07 19:37:50 UTC (rev 1813)
+++ trunk/bp-groups.php 2009-09-07 19:51:46 UTC (rev 1814)
</span><span class="lines">@@ -1407,7 +1407,7 @@
</span><span class="cx"> 'user_id' => $bp->loggedin_user->id,
</span><span class="cx"> 'content' => false,
</span><span class="cx"> 'primary_link' => false,
</span><del>- 'component_name' => 'groups',
</del><ins>+ 'component_name' => $bp->groups->id,
</ins><span class="cx"> 'component_action' => false,
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'secondary_item_id' => false,
</span></span></pre>
</div>
</div>
</body>
</html>