<!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] [2333] trunk:
Fixes #1588 - friendship accepted notification clear.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2333</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-18 12:13:44 +0000 (Mon, 18 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1588 - friendship accepted notification clear.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpfriendsphp">trunk/bp-friends.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpfriendsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends.php (2332 => 2333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends.php 2010-01-18 11:51:29 UTC (rev 2332)
+++ trunk/bp-friends.php 2010-01-18 12:13:44 UTC (rev 2333)
</span><span class="lines">@@ -683,6 +683,14 @@
</span><span class="cx"> wp_cache_delete( 'sitewide_activity', 'bp' );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function friends_clear_friend_notifications() {
+ global $bp;
+
+ if ( isset($_GET['new']) )
+ bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'friends', 'friendship_accepted' );
+}
+add_action( 'bp_activity_screen_my_activity', 'friends_clear_friend_notifications' );
+
</ins><span class="cx"> // List actions to clear object caches on
</span><span class="cx"> add_action( 'friends_friendship_accepted', 'friends_clear_friend_object_cache' );
</span><span class="cx"> add_action( 'friends_friendship_deleted', 'friends_clear_friend_object_cache' );
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (2332 => 2333)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2010-01-18 11:51:29 UTC (rev 2332)
+++ trunk/bp-xprofile.php 2010-01-18 12:13:44 UTC (rev 2333)
</span><span class="lines">@@ -285,11 +285,6 @@
</span><span class="cx"> function xprofile_screen_display_profile() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- // If this is a first visit to a new friends profile, delete the friend accepted notifications for the
- // logged in user, only if $_GET['new'] is set.
- if ( isset($_GET['new']) )
- bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'friends', 'friendship_accepted' );
-
</del><span class="cx"> do_action( 'xprofile_screen_display_profile', $_GET['new'] );
</span><span class="cx"> bp_core_load_template( apply_filters( 'xprofile_template_display_profile', 'members/single/home' ) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>