<!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] [2252] trunk/bp-blogs.php:
Fixes #1539 - missing primary blog activity.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2252</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-04 09:36:09 +0000 (Mon, 04 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1539 - missing primary blog activity.</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 (2251 => 2252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-01-04 09:20:13 UTC (rev 2251)
+++ trunk/bp-blogs.php 2010-01-04 09:36:09 UTC (rev 2252)
</span><span class="lines">@@ -360,15 +360,18 @@
</span><span class="cx"> if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
</span><span class="cx"> if ( 'publish' == $post->post_status && '' == $post->post_password ) {
</span><span class="cx">
</span><del>- $recorded_post = new BP_Blogs_Post;
- $recorded_post->user_id = $user_id;
- $recorded_post->blog_id = $blog_id;
- $recorded_post->post_id = $post_id;
- $recorded_post->date_created = strtotime( $post->post_date );
</del><ins>+ /* If we're on a multiblog install, record this post */
+ if ( bp_core_is_multiblog_install() ) {
+ $recorded_post = new BP_Blogs_Post;
+ $recorded_post->user_id = $user_id;
+ $recorded_post->blog_id = $blog_id;
+ $recorded_post->post_id = $post_id;
+ $recorded_post->date_created = strtotime( $post->post_date );
</ins><span class="cx">
</span><del>- $recorded_post_id = $recorded_post->save();
</del><ins>+ $recorded_post_id = $recorded_post->save();
</ins><span class="cx">
</span><del>- bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
</del><ins>+ bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
</span><span class="cx"> /* Record this in activity streams */
</span><span class="lines">@@ -382,7 +385,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' => $recorded_post_id,
</del><ins>+ 'item_id' => $blog_id,
+ 'secondary_item_id' => $post_id,
</ins><span class="cx"> 'recorded_time' => strtotime( $post->post_date )
</span><span class="cx"> ));
</span><span class="cx"> }
</span><span class="lines">@@ -449,32 +453,35 @@
</span><span class="cx"> if ( !empty( $post->post_password ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $recorded_comment = new BP_Blogs_Comment;
- $recorded_comment->user_id = $user_id;
- $recorded_comment->blog_id = $wpdb->blogid;
- $recorded_comment->comment_id = $comment_id;
- $recorded_comment->comment_post_id = $comment->comment_post_ID;
- $recorded_comment->date_created = strtotime( $comment->comment_date );
</del><ins>+ /* If we're on a multiblog install, record this post */
+ if ( bp_core_is_multiblog_install() ) {
+ $recorded_comment = new BP_Blogs_Comment;
+ $recorded_comment->user_id = $user_id;
+ $recorded_comment->blog_id = $wpdb->blogid;
+ $recorded_comment->comment_id = $comment_id;
+ $recorded_comment->comment_post_id = $comment->comment_post_ID;
+ $recorded_comment->date_created = strtotime( $comment->comment_date );
</ins><span class="cx">
</span><del>- $recorded_commment_id = $recorded_comment->save();
</del><ins>+ $recorded_commment_id = $recorded_comment->save();
</ins><span class="cx">
</span><del>- bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
</del><ins>+ bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
+ }
</ins><span class="cx">
</span><span class="cx"> if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
</span><span class="cx"> /* Record in activity streams */
</span><del>- $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
</del><ins>+ $comment_link = bp_post_get_permalink( $comment->post, $wpdb->blogid ) . '#comment-' . $comment_id;
</ins><span class="cx"> $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
</span><span class="cx"> $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
</span><span class="cx">
</span><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> bp_blogs_record_activity( array(
</span><del>- 'user_id' => $recorded_comment->user_id,
</del><ins>+ 'user_id' => $user_id,
</ins><span class="cx"> 'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ),
</span><span class="cx"> 'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
</span><span class="cx"> 'component_action' => 'new_blog_comment',
</span><del>- 'item_id' => $comment_id,
- 'secondary_item_id' => $recorded_comment->blog_id,
- 'recorded_time' => $recorded_comment->date_created
</del><ins>+ 'item_id' => $wpdb->blogid,
+ 'secondary_item_id' => $comment_id,
+ 'recorded_time' => strtotime( $comment->comment_date )
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>