<!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] [2332] trunk: Fixes #1585 props jivany</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2332</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-18 11:51:29 +0000 (Mon, 18 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1585 props jivany</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpfriendsbpfriendstemplatetagsphp">trunk/bp-friends/bp-friends-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="trunkbpfriendsbpfriendstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-templatetags.php (2331 => 2332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-templatetags.php 2010-01-18 11:50:33 UTC (rev 2331)
+++ trunk/bp-friends/bp-friends-templatetags.php 2010-01-18 11:51:29 UTC (rev 2332)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <ul class="horiz-gallery">
</span><span class="cx"> <?php for ( $i = 0; $i < count( $friend_ids ); $i++ ) { ?>
</span><span class="cx"> <li>
</span><del>- <a href="<?php echo bp_core_get_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
</del><ins>+ <a href="<?php echo bp_core_get_user_domain( $friend_ids[$i] ) ?>"><?php echo bp_core_fetch_avatar( array( 'item_id' => $friend_ids[$i], 'type' => 'thumb' ) ) ?></a>
</ins><span class="cx"> <h5><?php echo bp_core_get_userlink($friend_ids[$i]) ?></h5>
</span><span class="cx"> </li>
</span><span class="cx"> <?php } ?>
</span></span></pre></div>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (2331 => 2332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2010-01-18 11:50:33 UTC (rev 2331)
+++ trunk/bp-friends.php 2010-01-18 11:51:29 UTC (rev 2332)
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> return apply_filters( 'bp_friends_multiple_friendship_accepted_notification', '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/my-friends/newest" title="' . __( 'My Friends', 'buddypress' ) . '">' . sprintf( __('%d friends accepted your friendship requests', 'buddypress' ), (int)$total_items ) . '</a>', (int)$total_items );
</span><span class="cx"> } else {
</span><span class="cx"> $user_fullname = bp_core_get_user_displayname( $item_id );
</span><del>- $user_url = bp_core_get_domain( $item_id );
</del><ins>+ $user_url = bp_core_get_user_domain( $item_id );
</ins><span class="cx"> return apply_filters( 'bp_friends_single_friendship_accepted_notification', '<a href="' . $user_url . '?new" title="' . $user_fullname .'\'s profile">' . sprintf( __( '%s accepted your friendship request', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (2331 => 2332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-01-18 11:50:33 UTC (rev 2331)
+++ trunk/bp-groups.php 2010-01-18 11:51:29 UTC (rev 2332)
</span><span class="lines">@@ -1515,7 +1515,7 @@
</span><span class="cx"> $group_id = $item_id;
</span><span class="cx">
</span><span class="cx"> $group = new BP_Groups_Group( $group_id, false, false );
</span><del>- $user_url = bp_core_get_domain( $user_id );
</del><ins>+ $user_url = bp_core_get_user_domain( $user_id );
</ins><span class="cx">
</span><span class="cx"> if ( (int)$total_items > 1 ) {
</span><span class="cx"> return apply_filters( 'bp_groups_multiple_group_invite_notification', '<a href="' . $bp->loggedin_user->domain . $bp->groups->slug . '/invites/?n=1" title="' . __( 'Group Invites', 'buddypress' ) . '">' . sprintf( __('You have %d new group invitations', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
</span></span></pre>
</div>
</div>
</body>
</html>