<!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][9837] trunk: Make sure tracked post types registered using the `bp_blogs_record_post_post_types` filter will have the same activity tracking arguments than the `post` post type.</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/9837">9837</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/9837","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>2015-05-04 19:31:24 +0000 (Mon, 04 May 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'>Make sure tracked post types registered using the `bp_blogs_record_post_post_types` filter will have the same activity tracking arguments than the `post` post type.
Since 2.2.0, and the introduction of the custom post types activities feature, when a post type was registered using the `bp_blogs_record_post_post_types` filter it had specific tracking arguments. It introduced some inconsistency as soon as the filter `bp_blogs_record_comment_post_types` was also used to track comments about this post type and when the activity/comment syncing feature was on.
>From now on, post types registering to Site tracking using the filter `bp_blogs_record_post_post_types` will automatically get the same tracking arguments than the `post` post type to fix this inconsistency.
Props shanebp, boonebgorges
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6306">#6306</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsloaderphp">trunk/src/bp-blogs/bp-blogs-loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestcasesblogsfiltersphp">trunk/tests/phpunit/testcases/blogs/filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsloaderphp"></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-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-blogs/bp-blogs-loader.php 2015-05-04 14:05:12 UTC (rev 9836)
+++ trunk/src/bp-blogs/bp-blogs-loader.php 2015-05-04 19:31:24 UTC (rev 9837)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,9 +85,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== (int) get_option( 'blog_public' ) || ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the post types to track for the Blog component.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the post types to track for the Blogs component.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.5.0)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated BuddyPress (2.3.0)
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $value Array of post types to track.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,8 +298,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see bp_activity_get_post_type_tracking_args() for information on parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function post_tracking_args( $params = array(), $post_type = 0 ) {
- if ( 'post' != $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function post_tracking_args( $params = null, $post_type = 0 ) {
+ /**
+ * Filters the post types to track for the Blogs component.
+ *
+ * @since BuddyPress (1.5.0)
+ * @deprecated BuddyPress (2.3.0)
+ *
+ * Make sure plugins still using 'bp_blogs_record_post_post_types'
+ * to track their post types will generate new_blog_post activities
+ * See https://buddypress.trac.wordpress.org/ticket/6306
+ *
+ * @param array $value Array of post types to track.
+ */
+ $post_types = apply_filters( 'bp_blogs_record_post_post_types', array( 'post' ) );
+ $post_types_array = array_flip( $post_types );
+
+ if ( ! isset( $post_types_array[ $post_type ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $params;
</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="trunktestsphpunittestcasesblogsfiltersphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/testcases/blogs/filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/blogs/filters.php (rev 0)
+++ trunk/tests/phpunit/testcases/blogs/filters.php 2015-05-04 19:31:24 UTC (rev 9837)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,142 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @group blogs
+ * @ticket BP6306
+ */
+class BP_Tests_Blogs_Filters extends BP_UnitTestCase {
+ protected $activity_actions;
+ protected $custom_post_types;
+
+ public function setUp() {
+ parent::setUp();
+
+ $bp = buddypress();
+
+ $this->activity_actions = $bp->activity->actions;
+ $bp->activity->actions = new stdClass();
+
+ $this->custom_post_types = array( 'using_old_filter' );
+
+ register_post_type( 'using_old_filter', array(
+ 'label' => 'using_old_filter',
+ 'public' => true,
+ 'supports' => array( 'comments' ),
+ ) );
+
+ add_filter( 'bp_blogs_record_post_post_types', array( $this, 'filter_post_types'), 10, 1 );
+ add_filter( 'bp_blogs_record_comment_post_types', array( $this, 'filter_post_types'), 10, 1 );
+ }
+
+ function tearDown() {
+ parent::tearDown();
+
+ $bp = buddypress();
+
+ _unregister_post_type( 'using_old_filter' );
+ remove_filter( 'bp_blogs_record_post_post_types', array( $this, 'filter_post_types'), 10, 1 );
+ remove_filter( 'bp_blogs_record_comment_post_types', array( $this, 'filter_post_types'), 10, 1 );
+
+ // Reset activity actions
+ $bp->activity->actions = $this->activity_actions;
+ $bp->activity->track = array();
+ }
+
+ /**
+ * @goup bp_activity_get_actions
+ */
+ public function test_bp_activity_get_actions() {
+ $activity_actions = bp_activity_get_actions();
+
+ $this->assertTrue( ! isset( $activity_actions->activity->new_using_old_filter ), 'Post types registering using the bp_blogs_record_post_post_types filter should not have a specific action' );
+ }
+
+ /**
+ * @goup bp_activity_catch_transition_post_type_status
+ */
+ public function test_bp_activity_catch_transition_post_type_status() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'using_old_filter',
+ ) );
+
+ $this->assertTrue( $this->activity_exists_for_post_type( get_current_blog_id(), $post_id, 'new_blog_post' ), 'Generated activity for a post type registering using the bp_blogs_record_post_post_types filter should have a new_blog_post action' );
+ }
+
+ /**
+ * @goup bp_blogs_record_comment
+ */
+ public function test_bp_blogs_record_comment() {
+ $u = $this->factory->user->create();
+ $user = $this->factory->user->get_object_by_id( $u );
+
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'using_old_filter',
+ 'post_author' => $u,
+ ) );
+
+ $comment_id = $this->factory->comment->create( array(
+ 'user_id' => $u,
+ 'comment_author_email' => $user->user_email,
+ 'comment_post_ID' => $post_id,
+ ) );
+
+ // Approve the comment
+ $this->factory->comment->update_object( $comment_id, array( 'comment_approved' => 1 ) );
+
+ $this->assertTrue( $this->activity_exists_for_post_type( get_current_blog_id(), $comment_id, 'new_blog_comment' ), 'Generated activity for comments about a post type registering using the bp_blogs_record_post_post_types filter should have a new_blog_comment action' );
+ }
+
+ /**
+ * @goup bp_blogs_record_comment_sync_activity_comment
+ */
+ public function test_bp_blogs_record_comment_sync_activity_comment() {
+ $u = $this->factory->user->create();
+ $user = $this->factory->user->get_object_by_id( $u );
+
+ add_filter( 'bp_disable_blogforum_comments', '__return_false' );
+
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'using_old_filter',
+ 'post_author' => $u,
+ ) );
+
+ $parent_activity_id = bp_activity_get_activity_id( array(
+ 'component' => 'blogs',
+ 'type' => 'new_blog_post',
+ 'item_id' => get_current_blog_id(),
+ 'secondary_item_id' => $post_id
+ ) );
+
+ $comment_id = $this->factory->comment->create( array(
+ 'user_id' => $u,
+ 'comment_author_email' => $user->user_email,
+ 'comment_post_ID' => $post_id,
+ ) );
+
+ // Approve the comment
+ $this->factory->comment->update_object( $comment_id, array( 'comment_approved' => 1 ) );
+
+ $this->assertTrue( $this->activity_exists_for_post_type( $parent_activity_id, '', 'activity_comment', 'stream' ), 'Generated activity for comments about a post type registering using the bp_blogs_record_post_post_types filter having sync on should have a activity_comment action' );
+
+ remove_filter( 'bp_disable_blogforum_comments', '__return_false' );
+ }
+
+ public function filter_post_types( $post_types ) {
+ $post_types = array_merge( $post_types, $this->custom_post_types );
+ return $post_types;
+ }
+
+ protected function activity_exists_for_post_type( $item_id, $secondary_item_id, $action, $display_comments = false ) {
+ $a = bp_activity_get( array(
+ 'display_comments' => $display_comments,
+ 'filter' => array(
+ 'action' => $action,
+ 'primary_id' => $item_id,
+ 'secondary_id' => $secondary_item_id,
+ ) ) );
+
+ return ! empty( $a['activities'] );
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/testcases/blogs/filters.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span></div>
</body>
</html>