<!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] [3153] branches/1.2/bp-blogs.php:
  Fixes #2513 and code cleanup to bp_blogs_record_comment function</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>3153</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-01 10:48:30 +0000 (Sun, 01 Aug 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #2513 and code cleanup to 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 (3152 => 3153)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php        2010-08-01 10:18:18 UTC (rev 3152)
+++ branches/1.2/bp-blogs.php        2010-08-01 10:48:30 UTC (rev 3153)
</span><span class="lines">@@ -439,10 +439,11 @@
</span><span class="cx">  *
</span><span class="cx">  * @global object $wpdb
</span><span class="cx">  * @global $bp $bp
</span><del>- * @param &lt;type&gt; $comment_id
- * @param &lt;type&gt; $is_approved
- * @return &lt;type&gt;
</del><ins>+ * @param int $comment_id
+ * @param bool $is_approved
+ * @return mixed
</ins><span class="cx">  */
</span><ins>+
</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><span class="lines">@@ -450,7 +451,7 @@
</span><span class="cx">         $recorded_comment = get_comment( $comment_id );
</span><span class="cx"> 
</span><span class="cx">         // Don't record activity if the comment hasn't been approved
</span><del>-        if ( !$is_approved || true != $recorded_comment-&gt;comment_approved )
</del><ins>+        if ( !$is_approved || !$recorded_comment-&gt;comment_approved )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // Get blog and post data
</span><span class="lines">@@ -462,7 +463,7 @@
</span><span class="cx">         $user_id = (int)$user-&gt;ID;
</span><span class="cx"> 
</span><span class="cx">         // If there's no registered user id, don't record activity
</span><del>-        if ( !$user_id )
</del><ins>+        if ( empty( $user_id ) )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         // If this is a password protected post, don't record the comment
</span><span class="lines">@@ -473,23 +474,23 @@
</span><span class="cx">         if ( get_blog_option( $blog_id, 'blog_public' ) ) {
</span><span class="cx"> 
</span><span class="cx">                 // Get activity related links
</span><del>-                $post_permalink                = get_permalink( $recorded_comment-&gt;comment_post_ID );
-                $comment_link                = htmlspecialchars( get_comment_link( $recorded_comment-&gt;comment_ID ) );
</del><ins>+                $post_permalink = get_permalink( $recorded_comment-&gt;comment_post_ID );
+                $comment_link   = htmlspecialchars( get_comment_link( $recorded_comment-&gt;comment_ID ) );
</ins><span class="cx"> 
</span><span class="cx">                 // Prepare to record in activity streams
</span><del>-                $activity_action        = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '&lt;a href=&quot;' . $post_permalink . '&quot;&gt;' . $recorded_comment-&gt;post-&gt;post_title . '&lt;/a&gt;' );
</del><ins>+                $activity_action        = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '&lt;a href=&quot;' . $post_permalink . '&quot;&gt;' . apply_filters( 'the_title', $recorded_comment-&gt;post-&gt;post_title ) . '&lt;/a&gt;' );
</ins><span class="cx">                 $activity_content        = $recorded_comment-&gt;comment_content;
</span><span class="cx"> 
</span><span class="cx">                 // Record in activity streams
</span><span class="cx">                 bp_blogs_record_activity( array(
</span><del>-                        'user_id'                        =&gt; $user_id,
-                        'action'                        =&gt; apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &amp;$recorded_comment, $comment_link ),
-                        'content'                        =&gt; apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &amp;$recorded_comment, $comment_link ),
-                        'primary_link'                =&gt; apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &amp;$recorded_comment ),
-                        'type'                                =&gt; 'new_blog_comment',
-                        'item_id'                        =&gt; $blog_id,
-                        'secondary_item_id'        =&gt; $comment_id,
-                        'recorded_time'                =&gt; $recorded_comment-&gt;comment_date_gmt
</del><ins>+                        'user_id'           =&gt; $user_id,
+                        'action'            =&gt; apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &amp;$recorded_comment, $comment_link ),
+                        'content'           =&gt; apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &amp;$recorded_comment, $comment_link ),
+                        'primary_link'      =&gt; apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &amp;$recorded_comment ),
+                        'type'              =&gt; 'new_blog_comment',
+                        'item_id'           =&gt; $blog_id,
+                        'secondary_item_id' =&gt; $comment_id,
+                        'recorded_time'     =&gt; $recorded_comment-&gt;comment_date_gmt
</ins><span class="cx">                 ) );
</span><span class="cx"> 
</span><span class="cx">                 // Update the blogs last active date
</span></span></pre>
</div>
</div>

</body>
</html>