<!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] [1979] trunk/bp-blogs.php: Comment recording tweaks and fixes,
fixes #1074</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1979</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-28 20:48:50 +0000 (Mon, 28 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Comment recording tweaks and fixes, fixes #1074</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 (1978 => 1979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2009-09-28 20:06:31 UTC (rev 1978)
+++ trunk/bp-blogs.php 2009-09-28 20:48:50 UTC (rev 1979)
</span><span class="lines">@@ -474,8 +474,11 @@
</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 ) {
</del><ins>+function bp_blogs_approve_comment( $comment_id, $comment_status ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><ins>+
+ if ( 'approve' != $comment_status )
+ return false;
</ins><span class="cx">
</span><span class="cx"> $recorded_comment = bp_blogs_record_comment( $comment_id, true );
</span><span class="cx"> $comment = get_comment($comment_id);
</span><span class="lines">@@ -483,9 +486,9 @@
</span><span class="cx">
</span><span class="cx"> 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' ) );
</span><span class="cx">
</span><del>- $comment_link = bp_post_get_permalink( $comment->post, $comment->blog_id );
- $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>' );
- $content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
</del><ins>+ $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>';
</ins><span class="cx">
</span><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> bp_blogs_record_activity( array(
</span><span class="lines">@@ -498,13 +501,12 @@
</span><span class="cx"> 'recorded_time' => $recorded_comment->date_created
</span><span class="cx"> ) );
</span><span class="cx"> }
</span><del>-add_action( 'comment_approved_', 'bp_blogs_approve_comment', 10, 2 );
</del><ins>+add_action( 'wp_set_comment_status', 'bp_blogs_approve_comment', 10, 2 );
</ins><span class="cx">
</span><del>-function bp_blogs_unapprove_comment( $comment_id, $status = false ) {
- if ( 'spam' == $status || !$status )
</del><ins>+function bp_blogs_unapprove_comment( $comment_id, $comment_status ) {
+ if ( 'spam' == $comment_status || 'hold' == $comment_status || 'delete' == $comment_status )
</ins><span class="cx"> bp_blogs_remove_comment( $comment_id );
</span><span class="cx"> }
</span><del>-add_action( 'comment_unapproved_', 'bp_blogs_unapprove_comment' );
</del><span class="cx"> add_action( 'wp_set_comment_status', 'bp_blogs_unapprove_comment', 10, 2 );
</span><span class="cx">
</span><span class="cx"> function bp_blogs_add_user_to_blog( $user_id, $role, $blog_id ) {
</span></span></pre>
</div>
</div>
</body>
</html>