<!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] [2328] trunk/bp-blogs.php:
Fixes #1563 - duplication of blog and comments on activity stream.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2328</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-18 11:35:50 +0000 (Mon, 18 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1563 - duplication of blog and comments on activity stream. Added support for trashing of comments and blogs posts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2327 => 2328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-01-18 10:46:03 UTC (rev 2327)
+++ trunk/bp-blogs.php 2010-01-18 11:35:50 UTC (rev 2328)
</span><span class="lines">@@ -262,9 +262,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blogs_delete_activity( $args = true ) {
</span><ins>+ global $bp;
+
</ins><span class="cx"> if ( function_exists('bp_activity_delete_by_item_id') ) {
</span><del>- extract($args);
</del><ins>+ $defaults = array(
+ 'item_id' => false,
+ 'component_name' => $bp->blogs->id,
+ 'component_action' => false,
+ 'user_id' => false,
+ 'secondary_item_id' => false
+ );
</ins><span class="cx">
</span><ins>+ $params = wp_parse_args( $args, $defaults );
+ extract( $params, EXTR_SKIP );
+
</ins><span class="cx"> bp_activity_delete_by_item_id( array(
</span><span class="cx"> 'item_id' => $item_id,
</span><span class="cx"> 'component_name' => $component_name,
</span><span class="lines">@@ -423,7 +434,8 @@
</span><span class="cx"> 'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ),
</span><span class="cx"> 'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
</span><span class="cx"> 'component_action' => 'new_blog_post',
</span><del>- 'item_id' => $existing_post->id,
</del><ins>+ 'item_id' => $blog_id,
+ 'secondary_item_id' => $existing_post->id,
</ins><span class="cx"> 'recorded_time' => strtotime( $post->post_date_gmt )
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="lines">@@ -489,44 +501,14 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'comment_post', 'bp_blogs_record_comment', 10, 2 );
</span><span class="cx">
</span><del>-function bp_blogs_approve_comment( $comment_id, $comment_status ) {
- global $bp, $wpdb;
</del><ins>+function bp_blogs_manage_comment( $comment_id, $comment_status ) {
+ if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status || 'trash' == $comment_status )
+ return bp_blogs_remove_comment( $comment_id );
</ins><span class="cx">
</span><del>- if ( 'approve' != $comment_status )
- return false;
-
- $recorded_comment = bp_blogs_record_comment( $comment_id, true );
- $comment = get_comment($comment_id);
- $comment->post = get_post( $comment->comment_post_ID );
-
- bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
-
- if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
- /* Record in activity streams */
- $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
- $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
- $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
-
- /* Record this in activity streams */
- bp_blogs_record_activity( array(
- 'user_id' => $recorded_comment->user_id,
- 'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
- 'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
- 'component_action' => 'new_blog_comment',
- 'item_id' => $comment_id,
- 'secondary_item_id' => $recorded_comment->blog_id,
- 'recorded_time' => $recorded_comment->date_created
- ) );
- }
</del><ins>+ return bp_blogs_record_comment( $comment_id, true );
</ins><span class="cx"> }
</span><del>-add_action( 'wp_set_comment_status', 'bp_blogs_approve_comment', 10, 2 );
</del><ins>+add_action( 'wp_set_comment_status', 'bp_blogs_manage_comment', 10, 2 );
</ins><span class="cx">
</span><del>-function bp_blogs_unapprove_comment( $comment_id, $comment_status ) {
- if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status )
- bp_blogs_remove_comment( $comment_id );
-}
-add_action( 'wp_set_comment_status', 'bp_blogs_unapprove_comment', 10, 2 );
-
</del><span class="cx"> function bp_blogs_add_user_to_blog( $user_id, $role, $blog_id ) {
</span><span class="cx"> if ( $role != 'subscriber' ) {
</span><span class="cx"> bp_blogs_record_blog( $blog_id, $user_id, true );
</span><span class="lines">@@ -583,7 +565,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' => $existing_post->id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_post' ) );
</del><ins>+ bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'component_name' => $existing_post->id, 'component_action' => 'new_blog_post' ) );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_blogs_remove_post', $blog_id, $post_id, $post->user_id );
</span><span class="cx"> }
</span><span class="lines">@@ -596,7 +578,7 @@
</span><span class="cx"> BP_Blogs_Comment::delete( $comment_id, $wpdb->blogid );
</span><span class="cx">
</span><span class="cx"> // Delete activity stream item
</span><del>- bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
</del><ins>+ bp_blogs_delete_activity( array( 'item_id' => $wpdb->blogid, 'secondary_item_id' => $comment_id, 'component_action' => 'new_blog_comment' ) );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_blogs_remove_comment', $blog_id, $comment_id, $bp->loggedin_user->id );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>