<!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] [1910] trunk: Fixes #1048</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1910</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-21 21:37:22 +0000 (Mon, 21 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1048</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpwirebpwiretemplatetagsphp">trunk/bp-wire/bp-wire-templatetags.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpwirebpwiretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-wire/bp-wire-templatetags.php (1909 => 1910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-wire/bp-wire-templatetags.php 2009-09-21 21:18:36 UTC (rev 1909)
+++ trunk/bp-wire/bp-wire-templatetags.php 2009-09-21 21:37:22 UTC (rev 1910)
</span><span class="lines">@@ -22,11 +22,6 @@
</span><span class="cx">
</span><span class="cx"> if ( $bp->current_component == $bp->wire->slug ) {
</span><span class="cx"> $this->table_name = $bp->profile->table_name_wire;
</span><del>-
- // If the user is viewing their own wire, delete the notifications.
- if ( 'all-posts' == $bp->current_action && bp_is_home() )
- bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' );
-
</del><span class="cx"> } else
</span><span class="cx"> $this->table_name = $bp->{$bp->active_components[$component_slug]}->table_name_wire;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (1909 => 1910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php 2009-09-21 21:18:36 UTC (rev 1909)
+++ trunk/bp-xprofile.php 2009-09-21 21:37:22 UTC (rev 1910)
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx">
</span><span class="cx"> /* Record the notification for the reciever if it's not on their own wire */
</span><span class="cx"> if ( !bp_is_home() )
</span><del>- bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, 'profile', 'new_wire_post' );
</del><ins>+ bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' );
</ins><span class="cx">
</span><span class="cx"> /* Record this on the poster's activity screen */
</span><span class="cx"> if ( ( $wire_post->item_id == $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id == $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
</span><span class="lines">@@ -1095,7 +1095,7 @@
</span><span class="cx"> function xprofile_remove_screen_notifications() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'profile', 'new_wire_post' );
</del><ins>+ bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_wire_post' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_wire_screen_latest', 'xprofile_remove_screen_notifications' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>