<!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][13642] trunk: Make Activity loop reliable when post & activity comments are synced</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 { white-space: pre-line; 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/13642">13642</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/13642","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-11-10 02:09:10 +0000 (Fri, 10 Nov 2023)</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'>Make Activity loop reliable when post & activity comments are synced
As the `$action` key of the `bp_has_activities()` function arguments array accepts a string, a boolean as well as an array, we need to make sure the `bp_blogs_new_blog_comment_query_backpat()` function doesn't trigger an error when an array of activity type is passed.
Props btwebdesign, magland, teeboy4real
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/9010">#9010</a>
Closes https://github.com/buddypress/buddypress/pull/190</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsactivityphp">trunk/src/bp-blogs/bp-blogs-activity.php</a></li>
<li><a href="#trunktestsphpunittestcasesblogsactivityphp">trunk/tests/phpunit/testcases/blogs/activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsactivityphp"></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-activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-activity.php 2023-11-08 17:49:44 UTC (rev 13641)
+++ trunk/src/bp-blogs/bp-blogs-activity.php 2023-11-10 02:09:10 UTC (rev 13642)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,8 +1029,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $bp = buddypress();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If activity comments are disabled for blog posts, stop now!
- if ( bp_disable_blogforum_comments() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If activity comments are disabled for blog posts or if the action is not a string, stop now!
+ if ( bp_disable_blogforum_comments() || ! is_string( $args['action'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $args;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestcasesblogsactivityphp"></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/activity.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/activity.php 2023-11-08 17:49:44 UTC (rev 13641)
+++ trunk/tests/phpunit/testcases/blogs/activity.php 2023-11-10 02:09:10 UTC (rev 13642)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -617,6 +617,123 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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">+ * @ticket BP9010
+ * @group post_type_comment_activities
+ */
+ public function test_bp_blogs_new_blog_comment_query_backpat() {
+ $old_user = get_current_user_id();
+ $u = self::factory()->user->create();
+ $reset_at = isset( $GLOBALS['activities_template'] ) ? $GLOBALS['activities_template'] : null;
+
+ $this->set_current_user( $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 = self::factory()->post->create(
+ array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ 'post_title' => 'Test new_blog_comment_query_backpat',
+ )
+ );
+
+ // Grab the activity ID for the activity comment.
+ $a = 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
+ ),
+ )
+ );
+
+ $c = bp_activity_new_comment(
+ array(
+ 'content' => 'this activity should have the `new_blog_comment` type',
+ 'user_id' => $u,
+ 'activity_id' => $a,
+ )
+ );
+
+ // Check activity is fetch.
+ bp_has_activities(
+ array(
+ 'action' => 'new_blog_comment',
+ )
+ );
+
+ $ids = wp_list_pluck( $GLOBALS['activities_template']->activities, 'id' );
+ $this->assertEquals( array( $c ), $ids );
+
+ // Reset.
+ remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
+ $GLOBALS['activities_template'] = $reset_at;
+ $this->set_current_user( $old_user );
+ }
+
+ /**
+ * @ticket BP9010
+ * @group post_type_comment_activities
+ */
+ public function test_bp_blogs_new_blog_comment_query_backpat_with_array_of_actions() {
+ $old_user = get_current_user_id();
+ $u = self::factory()->user->create();
+ $reset_at = isset( $GLOBALS['activities_template'] ) ? $GLOBALS['activities_template'] : null;
+
+ $this->set_current_user( $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 = self::factory()->post->create(
+ array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ 'post_title' => 'Test new_blog_comment_query_backpat with an array',
+ )
+ );
+
+ // Grab the activity ID for the activity comment.
+ $a = 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
+ ),
+ )
+ );
+
+ $c = bp_activity_new_comment(
+ array(
+ 'content' => 'Check no fatal error is triggered!',
+ 'user_id' => $u,
+ 'activity_id' => $a,
+ )
+ );
+
+ // Check no fatal error is triggered.
+ bp_has_activities(
+ array(
+ 'action' => array( 'new_blog_comment', 'new_blog_comment' ),
+ )
+ );
+
+ $this->assertEmpty( $GLOBALS['activities_template']->activities );
+
+ // Reset.
+ remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
+ $GLOBALS['activities_template'] = $reset_at;
+ $this->set_current_user( $old_user );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Dopey passthrough method so we can check that the correct values
</span><span class="cx" style="display: block; padding: 0 10px"> * are being passed to the filter
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>