<!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] [3172] branches/1.2/bp-friends.php:
When friendship is accepted,
include alternate user_id in secondary_item_id.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3172</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-10 00:26:35 +0000 (Tue, 10 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>When friendship is accepted, include alternate user_id in secondary_item_id.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpfriendsphp">branches/1.2/bp-friends.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-friends.php (3171 => 3172)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-friends.php 2010-08-10 00:04:25 UTC (rev 3171)
+++ branches/1.2/bp-friends.php 2010-08-10 00:26:35 UTC (rev 3172)
</span><span class="lines">@@ -415,33 +415,35 @@
</span><span class="cx"> if ( !$friendship->is_confirmed && BP_Friends_Friendship::accept( $friendship_id ) ) {
</span><span class="cx"> friends_update_friend_totals( $friendship->initiator_user_id, $friendship->friend_user_id );
</span><span class="cx">
</span><del>- /* Remove the friend request notice */
</del><ins>+ // Remove the friend request notice
</ins><span class="cx"> bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
</span><span class="cx">
</span><del>- /* Add a friend accepted notice for the initiating user */
</del><ins>+ // Add a friend accepted notice for the initiating user
</ins><span class="cx"> bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' );
</span><span class="cx">
</span><span class="cx"> $initiator_link = bp_core_get_userlink( $friendship->initiator_user_id );
</span><span class="cx"> $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
</span><span class="cx">
</span><del>- /* Record in activity streams for the initiator */
</del><ins>+ // Record in activity streams for the initiator
</ins><span class="cx"> friends_record_activity( array(
</span><del>- 'user_id' => $friendship->initiator_user_id,
- 'type' => 'friendship_created',
- 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
- 'item_id' => $friendship_id
</del><ins>+ 'user_id' => $friendship->initiator_user_id,
+ 'type' => 'friendship_created',
+ 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
+ 'item_id' => $friendship_id,
+ 'secondary_item_id' => $friendship->friend_user_id
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- /* Record in activity streams for the friend */
</del><ins>+ // Record in activity streams for the friend
</ins><span class="cx"> friends_record_activity( array(
</span><del>- 'user_id' => $friendship->friend_user_id,
- 'type' => 'friendship_created',
- 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
- 'item_id' => $friendship_id,
- 'hide_sitewide' => true /* We've already got the first entry site wide */
</del><ins>+ 'user_id' => $friendship->friend_user_id,
+ 'type' => 'friendship_created',
+ 'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
+ 'item_id' => $friendship_id,
+ 'secondary_item_id' => $friendship->initiator_user_id,
+ 'hide_sitewide' => true // We've already got the first entry site wide
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- /* Send the email notification */
</del><ins>+ // Send the email notification
</ins><span class="cx"> require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
</span><span class="cx"> friends_notification_accepted_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>