<!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] [2636] trunk:
  Fixing post trashing and activity stream recording.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2636</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-08 17:06:45 +0000 (Mon, 08 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixing post trashing and activity stream recording.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (2635 => 2636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php        2010-02-08 16:24:52 UTC (rev 2635)
+++ trunk/bp-activity.php        2010-02-08 17:06:45 UTC (rev 2636)
</span><span class="lines">@@ -726,6 +726,8 @@
</span><span class="cx">         do_action( 'bp_activity_delete', $args );
</span><span class="cx">         do_action( 'bp_activity_deleted_activities', $activity_ids_deleted );
</span><span class="cx"> 
</span><ins>+        wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
+
</ins><span class="cx">         return true;
</span><span class="cx"> }
</span><span class="cx">         /* The following functions have been deprecated in place of bp_activity_delete() */
</span></span></pre></div>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2635 => 2636)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php        2010-02-08 16:24:52 UTC (rev 2635)
+++ trunk/bp-blogs.php        2010-02-08 17:06:45 UTC (rev 2636)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx">         BP_Blogs_Post::delete( $post_id, $blog_id );
</span><span class="cx"> 
</span><span class="cx">         // Delete activity stream item
</span><del>-        bp_blogs_delete_activity( array( 'item_id' =&gt; $wpdb-&gt;blogid, 'component' =&gt; $existing_post-&gt;id, 'type' =&gt; 'new_blog_post' ) );
</del><ins>+        bp_blogs_delete_activity( array( 'item_id' =&gt; $blog_id, 'secondary_item_id' =&gt; $post_id, 'component' =&gt; $bp-&gt;blogs-&gt;slug, 'type' =&gt; 'new_blog_post' ) );
</ins><span class="cx"> 
</span><span class="cx">         do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post-&gt;user_id );
</span><span class="cx"> }
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx">         BP_Blogs_Comment::delete( $comment_id, $wpdb-&gt;blogid );
</span><span class="cx"> 
</span><span class="cx">         // Delete activity stream item
</span><del>-        bp_blogs_delete_activity( array( 'item_id' =&gt; $wpdb-&gt;blogid, 'secondary_item_id' =&gt; $comment_id, 'type' =&gt; 'new_blog_comment' ) );
</del><ins>+        bp_blogs_delete_activity( array( 'item_id' =&gt; $wpdb-&gt;blogid , 'secondary_item_id' =&gt; $comment_id, 'type' =&gt; 'new_blog_comment' ) );
</ins><span class="cx"> 
</span><span class="cx">         do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id, $bp-&gt;loggedin_user-&gt;id );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>