<!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][8073] trunk: Improved management of new_blog_post activity items at transition_post_status</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8073">8073</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-06 21:02:22 +0000 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved management of new_blog_post activity items at transition_post_status
Introduces bp_blogs_catch_transition_post_status(). This function, which
replaces bp_blogs_catch_published_post(), performs a similar task - determining
when a new blog post has been published, and recording the post in the activity
stream - but adds a corrolary for unpublishing that deletes the activity item.
Unit tests and deprecated function are included.
See <a href="http://buddypress.trac.wordpress.org/ticket/5333">#5333</a>
Props henry.wright for an initial patch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpcoredeprecated20php">trunk/bp-core/deprecated/2.0.php</a></li>
<li><a href="#trunkteststestcasesblogsfunctionsphp">trunk/tests/testcases/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 (8072 => 8073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2014-03-06 20:35:17 UTC (rev 8072)
+++ trunk/bp-blogs/bp-blogs-functions.php 2014-03-06 21:02:22 UTC (rev 8073)
</span><span class="lines">@@ -259,27 +259,29 @@
</span><span class="cx"> *
</span><span class="cx"> * See #4090, #3746, #2546 for background.
</span><span class="cx"> *
</span><del>- * @since BuddyPress (1.9.0)
</del><ins>+ * @since BuddyPress (2.0.0)
</ins><span class="cx"> *
</span><span class="cx"> * @param string $new_status New status for the post.
</span><span class="cx"> * @param string $old_status Old status for the post.
</span><span class="cx"> * @param object $post Post data.
</span><span class="cx"> */
</span><del>-function bp_blogs_catch_published_post( $new_status, $old_status, $post ) {
</del><ins>+function bp_blogs_catch_transition_post_status( $new_status, $old_status, $post ) {
</ins><span class="cx">
</span><del>- // Only record published posts
- if ( 'publish' !== $new_status ) {
</del><ins>+ // Do nothing for edits
+ if ( $new_status === $old_status ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Don't record edits (publish -> publish)
- if ( 'publish' === $old_status ) {
- return;
</del><ins>+ // Publishing a previously unpublished post
+ if ( 'publish' === $new_status ) {
+ return bp_blogs_record_post( $post->ID, $post );
+
+ // Unpublishing a previously published post
+ } else if ( 'publish' === $old_status ) {
+ return bp_blogs_remove_post( $post->ID );
</ins><span class="cx"> }
</span><del>-
- return bp_blogs_record_post( $post->ID, $post );
</del><span class="cx"> }
</span><del>-add_action( 'transition_post_status', 'bp_blogs_catch_published_post', 10, 3 );
</del><ins>+add_action( 'transition_post_status', 'bp_blogs_catch_transition_post_status', 10, 3 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Record a new blog post in the BuddyPress activity stream.
</span></span></pre></div>
<a id="trunkbpcoredeprecated20php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/2.0.php (8072 => 8073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/2.0.php 2014-03-06 20:35:17 UTC (rev 8072)
+++ trunk/bp-core/deprecated/2.0.php 2014-03-06 21:02:22 UTC (rev 8073)
</span><span class="lines">@@ -1,8 +1,25 @@
</span><span class="cx"> <?php
</span><ins>+/**
+ * Deprecated Functions
+ *
+ * @package BuddyPress
+ * @subpackage Core
+ * @deprecated 2.0.0
+ */
</ins><span class="cx">
</span><ins>+// Exit if accessed directly
+if ( !defined( 'ABSPATH' ) ) exit;
+
</ins><span class="cx"> /**
</span><span class="cx"> * @deprecated BuddyPress (2.0.0)
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_clear_meta_cache_for_activity() {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '2.0.0', 'Use WP metadata API instead' );
</span><span class="cx"> }
</span><ins>+
+/**
+ * @deprecated BuddyPress (2.0.0)
+ */
+function bp_blogs_catch_published_post() {
+ _deprecated_function( __FUNCTION__, '2.0', 'bp_blogs_catch_transition_post_status()' );
+}
</ins></span></pre></div>
<a id="trunkteststestcasesblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/blogs/functions.php (8072 => 8073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/blogs/functions.php 2014-03-06 20:35:17 UTC (rev 8072)
+++ trunk/tests/testcases/blogs/functions.php 2014-03-06 21:02:22 UTC (rev 8073)
</span><span class="lines">@@ -265,4 +265,130 @@
</span><span class="cx"> bp_blogs_add_blogmeta( 1, 'foo', 'bar' );
</span><span class="cx"> $this->assertNotEmpty( bp_blogs_add_blogmeta( 1, 'foo', 'baz' ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group bp_blogs_catch_transition_post_status
+ */
+ public function test_transition_post_status_publish_to_publish() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ ) );
+ $post = get_post( $post_id );
+
+ // 'publish' => 'publish'
+ $this->assertTrue( $this->activity_exists_for_post( $post_id ), 'Published post should have activity' );
+
+ $post->post_status = 'publish';
+ $post->post_content .= ' foo';
+
+ wp_update_post( $post );
+
+ $this->assertTrue( $this->activity_exists_for_post( $post_id ), 'Published post should have activity (no change)' );
+ }
+
+ /**
+ * @group bp_blogs_catch_transition_post_status
+ */
+ public function test_transition_post_status_draft_to_draft() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'draft',
+ 'post_type' => 'post',
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertFalse( $this->activity_exists_for_post( $post_id ), 'Unpublished post should not have activity' );
+
+ $post->post_status = 'draft';
+ $post->post_content .= ' foo';
+
+ wp_update_post( $post );
+
+ $this->assertFalse( $this->activity_exists_for_post( $post_id ), 'Unpublished post should not have activity (no change)' );
+ }
+
+ /**
+ * @group bp_blogs_catch_transition_post_status
+ */
+ public function test_transition_post_status_draft_to_publish() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'draft',
+ 'post_type' => 'post',
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertFalse( $this->activity_exists_for_post( $post_id ), 'Unpublished post should not have activity' );
+
+ $post->post_status = 'publish';
+ $post->post_content .= ' foo';
+
+ wp_update_post( $post );
+
+ $this->assertTrue( $this->activity_exists_for_post( $post_id ), 'Published post should have activity' );
+ }
+
+ /**
+ * @group bp_blogs_catch_transition_post_status
+ */
+ public function test_transition_post_status_publish_to_draft() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertTrue( $this->activity_exists_for_post( $post_id ), 'Published post should have activity' );
+
+ $post->post_status = 'draft';
+ $post->post_content .= ' foo';
+
+ wp_update_post( $post );
+
+ $this->assertFalse( $this->activity_exists_for_post( $post_id ), 'Unpublished post should not have activity' );
+ }
+
+ /**
+ * @group bp_blogs_catch_transition_post_status
+ */
+ public function test_transition_post_status_wp_delete_post() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertTrue( $this->activity_exists_for_post( $post_id ), 'Published post should have activity' );
+
+ wp_delete_post( $post->ID );
+
+ $this->assertFalse( $this->activity_exists_for_post( $post_id ), 'Unpublished post should not have activity' );
+ }
+
+ /**
+ * @group bp_blogs_catch_transition_post_status
+ */
+ public function test_transition_post_status_wp_trash_post() {
+ $post_id = $this->factory->post->create( array(
+ 'post_status' => 'publish',
+ 'post_type' => 'post',
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertTrue( $this->activity_exists_for_post( $post_id ), 'Published post should have activity' );
+
+ wp_trash_post( $post->ID );
+
+ $this->assertFalse( $this->activity_exists_for_post( $post_id ), 'Unpublished post should not have activity' );
+ }
+
+ protected function activity_exists_for_post( $post_id ) {
+ $a = bp_activity_get( array(
+ 'component' => buddypress()->blogs->id,
+ 'action' => 'new_blog_post',
+ 'item_id' => get_current_blog_id(),
+ 'secondary_item_id' => $post_id,
+ ) );
+
+ return ! empty( $a['total'] );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>