<!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][10277] trunk: Blogs: Record activity item for blog post if it doesn't exist when a post comment is posted.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10277">10277</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10277","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>r-a-y</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-14 16:37:30 +0000 (Wed, 14 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Blogs: Record activity item for blog post if it doesn't exist when a post comment is posted.
Fixes an issue where if "Allow activity stream commenting on blog and forum
posts" is enabled, the activity item for the post comment would not be
created because the activity item for the blog post does not exist.
This might occur if the "Site Tracking" component is enabled after posts
have already been published.
Commit also includes a unit test.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6530">#6530</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesblogsfunctionsphp">trunk/tests/phpunit/testcases/blogs/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-blogs/bp-blogs-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-functions.php 2015-10-14 16:03:03 UTC (rev 10276)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2015-10-14 16:37:30 UTC (rev 10277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -673,6 +673,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'secondary_item_id' => $recorded_comment->comment_post_ID
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Try to create a new activity item for the parent blog post
+ if ( empty( $parent_activity_id ) ) {
+ $parent_activity_id = bp_activity_post_type_publish( $recorded_comment->comment_post_ID, $recorded_comment->post );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // we found the parent activity entry
</span><span class="cx" style="display: block; padding: 0 10px"> // so let's go ahead and reconfigure some activity args
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $parent_activity_id ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestcasesblogsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/blogs/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/functions.php 2015-10-14 16:03:03 UTC (rev 10276)
+++ trunk/tests/phpunit/testcases/blogs/functions.php 2015-10-14 16:37:30 UTC (rev 10277)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,6 +775,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_current_user( $old_user );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @group bp_blogs_record_comment
+ */
+ public function test_bp_blogs_record_comment_should_record_parent_blog_post_activity_if_not_found() {
+ // Save the current user and override logged-in user
+ $old_user = get_current_user_id();
+ $u = $this->factory->user->create();
+ $this->set_current_user( $u );
+
+ // Get user details
+ $user = get_userdata( $u );
+
+ // Let's use activity comments instead of single "new_blog_comment" activity items
+ add_filter( 'bp_disable_blogforum_comments', '__return_false' );
+
+ // Create the blog post
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ ) );
+
+ // Now, delete the activity item for the blog post
+ bp_activity_delete( array(
+ 'component' => buddypress()->blogs->id,
+ 'type' => 'new_blog_post',
+ 'item_id' => get_current_blog_id(),
+ 'secondary_item_id' => $post_id,
+ ) );
+
+ // Add a comment to blog post
+ wp_new_comment( array(
+ 'comment_post_ID' => $post_id,
+ 'user_id' => $u,
+ 'comment_content' => 'Dummy comment',
+ 'comment_author' => 'Dumbo',
+ 'comment_author_url' => 'http://buddypress.org',
+
+ // Important to pass check in bp_blogs_record_comment()
+ 'comment_author_email' => $user->user_email
+ ) );
+
+ // Fetch the activity ID for the blog post to see if it exists
+ $a1 = bp_activity_get_activity_id( array(
+ 'type' => 'new_blog_post',
+ 'component' => buddypress()->blogs->id,
+ 'filter' => array(
+ 'item_id' => get_current_blog_id(),
+ 'secondary_item_id' => $post_id
+ ),
+ ) );
+
+ // Assert that activity item for blog post was created after adding a comment
+ $this->assertNotNull( $a1, 'Activity item was not created for existing blog post when recording post comment.' );
+
+ $this->set_current_user( $old_user );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function count_activity_comment_saved() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->activity_saved_comment_count += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>