<!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] [3053] branches/1.2/bp-blogs.php:
Fix issue where comments would appear in activity even if blog was private
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3053</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-14 11:10:18 +0000 (Mon, 14 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix issue where comments would appear in activity even if blog was private. Also clean up bp_blogs_record_comment function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpblogsphp">branches/1.2/bp-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-blogs.php (3052 => 3053)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php 2010-06-14 10:26:16 UTC (rev 3052)
+++ branches/1.2/bp-blogs.php 2010-06-14 11:10:18 UTC (rev 3053)
</span><span class="lines">@@ -431,45 +431,65 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'save_post', 'bp_blogs_record_post', 10, 2 );
</span><span class="cx">
</span><ins>+/**
+ * bp_blogs_record_comment()
+ *
+ * Record blog comment activity. Checks if blog is public and post is not
+ * password protected.
+ *
+ * @global object $wpdb
+ * @global $bp $bp
+ * @param <type> $comment_id
+ * @param <type> $is_approved
+ * @return <type>
+ */
</ins><span class="cx"> function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- $comment = get_comment($comment_id);
</del><ins>+ // Get the users comment
+ $recorded_comment = get_comment( $comment_id );
</ins><span class="cx">
</span><del>- if ( !$is_approved )
</del><ins>+ // Don't record activity if the comment hasn't been approved
+ if ( !$is_approved || true != $recorded_comment->comment_approved )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- $comment->post = get_post( $comment->comment_post_ID );
</del><ins>+ // Get blog and post data
+ $blog_id = (int)$wpdb->blogid;
+ $recorded_comment->post = get_post( $recorded_comment->comment_post_ID );
</ins><span class="cx">
</span><del>- /* Get the user_id from the author email. */
- $user = get_user_by_email( $comment->comment_author_email );
</del><ins>+ // Get the user_id from the comment author email.
+ $user = get_user_by_email( $recorded_comment->comment_author_email );
</ins><span class="cx"> $user_id = (int)$user->ID;
</span><span class="cx">
</span><ins>+ // If there's no registered user id, don't record activity
</ins><span class="cx"> if ( !$user_id )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- /* If this is a password protected post, don't record the comment */
- if ( !empty( $post->post_password ) )
</del><ins>+ // If this is a password protected post, don't record the comment
+ if ( !empty( $recorded_comment->post->post_password ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
- /* Record in activity streams */
- $comment_link = htmlspecialchars( get_comment_link( $comment->comment_ID ) );
- $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '">' . $comment->post->post_title . '</a>' );
- $activity_content = $comment->comment_content;
</del><ins>+ // If blog is public allow activity to be posted
+ if ( get_blog_option( $blog_id, 'blog_public' ) ) {
</ins><span class="cx">
</span><del>- /* Record this in activity streams */
</del><ins>+ // Prepare to record in activity streams
+ $comment_link = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
+ $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '">' . $recorded_comment->post->post_title . '</a>' );
+ $activity_content = $recorded_comment->comment_content;
+
+ // Record in activity streams
</ins><span class="cx"> bp_blogs_record_activity( array(
</span><span class="cx"> 'user_id' => $user_id,
</span><del>- 'action' => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$comment, &$recorded_comment, $comment_link ),
- 'content' => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$comment, &$recorded_comment, $comment_link ),
- 'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
</del><ins>+ 'action' => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$recorded_comment, $comment_link ),
+ 'content' => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$recorded_comment, $comment_link ),
+ 'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$recorded_comment ),
</ins><span class="cx"> 'type' => 'new_blog_comment',
</span><del>- 'item_id' => $wpdb->blogid,
</del><ins>+ 'item_id' => $blog_id,
</ins><span class="cx"> 'secondary_item_id' => $comment_id,
</span><del>- 'recorded_time' => $comment->comment_date_gmt
</del><ins>+ 'recorded_time' => $recorded_comment->comment_date_gmt
</ins><span class="cx"> ) );
</span><span class="cx">
</span><ins>+ // Update the blogs last active date
</ins><span class="cx"> bp_blogs_update_blogmeta( $blog_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>