<!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][12311] trunk: Blogs: Ensure activity data integrity when updating post title.</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/12311">12311</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/12311","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-04 15:39:36 +0000 (Tue, 04 Dec 2018)</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: Ensure activity data integrity when updating post title.
Previously, a missing `primary_id` could cause the `post_title` activity meta
value to be updated for activity items unrelated to the one linked to the
updated blog post.
Props r-a-y.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8007">#8007</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsfunctionsphp">trunk/src/bp-blogs/bp-blogs-functions.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="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 2018-12-04 15:36:29 UTC (rev 12310)
+++ trunk/src/bp-blogs/bp-blogs-functions.php 2018-12-04 15:39:36 UTC (rev 12311)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,6 +662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['filter'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $activity_post_object->comments_tracking->component_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => $activity_post_object->comments_tracking->action_id,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'primary_id' => get_current_blog_id(),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'secondary_id' => implode( ',', $comment_ids ),
</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 2018-12-04 15:36:29 UTC (rev 12310)
+++ trunk/tests/phpunit/testcases/blogs/activity.php 2018-12-04 15:39:36 UTC (rev 12311)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,6 +314,87 @@
</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">+ * @group post_type_comment_activities
+ */
+ public function test_bp_blogs_update_post_title_activity_meta_should_not_be_the_same_for_same_comment_id() {
+ global $wpdb;
+
+ if ( ! is_multisite() ) {
+ $this->markTestSkipped();
+ }
+
+ if ( function_exists( 'wp_initialize_site' ) ) {
+ $this->setExpectedDeprecated( 'wpmu_new_blog' );
+ }
+
+ $b1 = self::factory()->blog->create();
+ $b2 = self::factory()->blog->create();
+ $b3 = self::factory()->blog->create();
+ $u = self::factory()->user->create();
+ $u2 = self::factory()->user->create();
+ $commenter = self::factory()->user->get_object_by_id( $u2 );
+
+ $bids = array( $b1, $b2, $b3 );
+ $pids = array();
+
+ foreach ( $bids as $bid ) {
+ switch_to_blog( $bid );
+
+ // Ensure blog privacy is public so post activities are recorded.
+ update_option( 'blog_public', 1 );
+
+ // Create the post.
+ $pids[ $bid ] = self::factory()->post->create( array(
+ 'post_author' => $u,
+ ) );
+
+ /*
+ * Create the post comment.
+ *
+ * Both user_id and comment_author_email are required for unit tests.
+ */
+ $c = self::factory()->comment->create( array(
+ 'user_id' => $u2,
+ 'comment_author_email' => $commenter->user_email,
+ 'comment_post_ID' => $pids[ $bid ],
+ ) );
+
+ // Approve the comment so the activity item is generated.
+ self::factory()->comment->update_object( $c, array( 'comment_approved' => 1 ) );
+
+ restore_current_blog();
+ }
+
+ // Now update the post title on one blog only.
+ switch_to_blog( $b1 );
+ wp_update_post( array(
+ 'ID' => $pids[ $b1 ],
+ 'post_title' => 'Updated'
+ ) );
+ restore_current_blog();
+
+ // Check our activity meta to see if the post title is different.
+ $aids = bp_activity_get( array(
+ 'fields' => 'ids',
+ 'filter' => array(
+ 'action' => 'new_blog_comment'
+ )
+ ) );
+ $aids= $aids['activities'];
+ foreach ( $aids as $aid ) {
+ // Skip the check for the correct blog.
+ $a = new BP_Activity_Activity( $aid );
+ if ( $a->item_id == $b1 ) {
+ continue;
+ }
+
+ // Assert that post title is different.
+ $post_title = bp_activity_get_meta( $aid, 'post_title' );
+ $this->assertFalse( 'Updated' === $post_title, 'Post title should not be the same across all sites with the same post comment ID' );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket BP6126
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_check_activity_actions_are_set_when_creating_activity_object() {
</span></span></pre>
</div>
</div>
</body>
</html>