<!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] [3209] branches/1.2/bp-blogs.php: Fixes #2590</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3209</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-21 04:59:31 +0000 (Sat, 21 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2590</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 (3208 => 3209)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php 2010-08-21 04:44:10 UTC (rev 3208)
+++ branches/1.2/bp-blogs.php 2010-08-21 04:59:31 UTC (rev 3209)
</span><span class="lines">@@ -456,10 +456,10 @@
</span><span class="cx"> if ( !$is_approved || !$recorded_comment->comment_approved )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Get blog and post data
- $blog_id = (int)$wpdb->blogid;
- $recorded_comment->post = get_post( $recorded_comment->comment_post_ID );
-
</del><ins>+ // Don't record activity if no email address has been included
+ if ( empty( $recorded_comment->comment_author_email ) )
+ return false;
+
</ins><span class="cx"> // Get the user_id from the comment author email.
</span><span class="cx"> $user = get_user_by_email( $recorded_comment->comment_author_email );
</span><span class="cx"> $user_id = (int)$user->ID;
</span><span class="lines">@@ -468,6 +468,10 @@
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><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"> // 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></pre>
</div>
</div>
</body>
</html>