<!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] [2117] branches/1.1/bp-friends.php: Fixes #1289 props MrMaz</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2117</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-25 10:05:30 +0000 (Wed, 25 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1289 props MrMaz</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches11bpfriendsphp">branches/1.1/bp-friends.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches11bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-friends.php (2116 => 2117)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-friends.php 2009-11-25 10:04:28 UTC (rev 2116)
+++ branches/1.1/bp-friends.php 2009-11-25 10:05:30 UTC (rev 2117)
</span><span class="lines">@@ -117,8 +117,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset($bp->action_variables) && 'accept' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
</span><span class="cx"> /* Check the nonce */
</span><del>- if ( !check_admin_referer( 'friends_accept_friendship' ) )
- return false;
</del><ins>+ check_admin_referer( 'friends_accept_friendship' );
</ins><span class="cx">
</span><span class="cx"> if ( friends_accept_friendship( $bp->action_variables[1] ) ) {
</span><span class="cx"> bp_core_add_message( __( 'Friendship accepted', 'buddypress' ) );
</span><span class="lines">@@ -129,9 +128,9 @@
</span><span class="cx">
</span><span class="cx"> } else if ( isset($bp->action_variables) && 'reject' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
</span><span class="cx"> /* Check the nonce */
</span><del>- if ( !check_admin_referer( 'friends_reject_friendship' ) )
- return false;
</del><ins>+ check_admin_referer( 'friends_reject_friendship' );
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> if ( friends_reject_friendship( $bp->action_variables[1] ) ) {
</span><span class="cx"> bp_core_add_message( __( 'Friendship rejected', 'buddypress' ) );
</span><span class="cx"> } else {
</span><span class="lines">@@ -629,7 +628,7 @@
</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>- $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userlink( $friendship->initiator_user_id ), &$friendship );
</del><ins>+ $primary_link = apply_filters( 'friends_activity_friendship_accepted_primary_link', bp_core_get_userurl( $friendship->initiator_user_id ), &$friendship );
</ins><span class="cx">
</span><span class="cx"> /* Record in activity streams for the initiator */
</span><span class="cx"> friends_record_activity( array(
</span></span></pre>
</div>
</div>
</body>
</html>