<!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" />
<title>[BuddyPress][4959] trunk/bp-blogs/bp-blogs-functions.php: When recording activity items for comments, check that the post object is a standard WordPress Post.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/4959">4959</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-08-09 20:11:13 +0000 (Tue, 09 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>When recording activity items for comments, check that the post object is a standard WordPress Post. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3455">#3455</a>, props sbrajesh for initial patch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (4958 => 4959)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2011-08-09 19:32:28 UTC (rev 4958)
+++ trunk/bp-blogs/bp-blogs-functions.php 2011-08-09 20:11:13 UTC (rev 4959)
</span><span class="lines">@@ -205,14 +205,13 @@
</span><span class="cx"> * Record blog comment activity. Checks if blog is public and post is not
</span><span class="cx"> * password protected.
</span><span class="cx"> *
</span><del>- * @global object $wpdb
</del><span class="cx"> * @global $bp $bp
</span><span class="cx"> * @param int $comment_id
</span><span class="cx"> * @param bool $is_approved
</span><span class="cx"> * @return mixed
</span><span class="cx"> */
</span><span class="cx"> function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
</span><del>- global $wpdb, $bp;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><span class="cx"> // Get the users comment
</span><span class="cx"> $recorded_comment = get_comment( $comment_id );
</span><span class="lines">@@ -234,13 +233,20 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Get blog and post data
</span><del>- $blog_id = (int)$wpdb->blogid;
</del><ins>+ $blog_id = get_current_blog_id();
</ins><span class="cx"> $recorded_comment->post = get_post( $recorded_comment->comment_post_ID );
</span><span class="cx">
</span><ins>+ if ( empty( $recorded_comment->post ) || is_wp_error( $recorded_comment->post ) )
+ return false;
+
</ins><span class="cx"> // If this is a password protected post, don't record the comment
</span><span class="cx"> if ( !empty( $recorded_comment->post->post_password ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // Don't record activity if the comment's associated post isn't a WordPress Post
+ if ( 'post' != $recorded_comment->post->post_type )
+ return false;
+
</ins><span class="cx"> $is_blog_public = apply_filters( 'bp_is_blog_public', (int)get_blog_option( $blog_id, 'blog_public' ) );
</span><span class="cx">
</span><span class="cx"> // If blog is public allow activity to be posted
</span></span></pre>
</div>
</div>
</body>
</html>