<!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][11583] trunk: Activity: Fix activity comment deletion when comment ID equals `0`.</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/11583">11583</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/11583","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>2017-06-09 20:35:52 +0000 (Fri, 09 Jun 2017)</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'>Activity: Fix activity comment deletion when comment ID equals `0`.
In <a href="http://buddypress.trac.wordpress.org/ticket/7394">#7394</a>, non-existent activity ID lookups now default to zero, instead of
the ID that was passed. For example, `$a = new BP_Activity_Activity( 99 )`,
`$a->id` now equals `0` instead of `99`.
This is logistically correct; however, this raised a bug with
`bp_activity_delete_comment()` when passing `0` as the comment ID, which
could potentially delete all activity comments in the database.
Props Maniou.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7450">#7450</a> (trunk)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunktestsphpunittestcasesactivityfunctionsphp">trunk/tests/phpunit/testcases/activity/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-functions.php 2017-06-08 18:36:43 UTC (rev 11582)
+++ trunk/src/bp-activity/bp-activity-functions.php 2017-06-09 20:35:52 UTC (rev 11583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2963,6 +2963,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $deleted;
</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">+ // Check if comment still exists.
+ $comment = new BP_Activity_Activity( $comment_id );
+ if ( empty( $comment->id ) ) {
+ return false;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Delete any children of this comment.
</span><span class="cx" style="display: block; padding: 0 10px"> bp_activity_delete_children( $activity_id, $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3003,6 +3009,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $comment_id The ID of the comment to be deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_delete_children( $activity_id, $comment_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check if comment still exists.
+ $comment = new BP_Activity_Activity( $comment_id );
+ if ( empty( $comment->id ) ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get activity children to delete.
</span><span class="cx" style="display: block; padding: 0 10px"> $children = BP_Activity_Activity::get_child_comments( $comment_id );
</span></span></pre></div>
<a id="trunktestsphpunittestcasesactivityfunctionsphp"></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/activity/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/activity/functions.php 2017-06-08 18:36:43 UTC (rev 11582)
+++ trunk/tests/phpunit/testcases/activity/functions.php 2017-06-09 20:35:52 UTC (rev 11583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1278,6 +1278,53 @@
</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 bp_activity_delete_comment
+ * @ticket BP7450
+ */
+ public function test_bp_activity_delete_comment_shouldnt_delete_all_comments_when_parameters_are_empty() {
+ $u = $this->factory->user->create();
+
+ // create an activity update
+ $parent_activity = $this->factory->activity->create( array(
+ 'type' => 'activity_update',
+ 'user_id' => $u
+ ) );
+
+ // create some activity comments
+ $comment_one = bp_activity_new_comment( array(
+ 'user_id' => $u,
+ 'activity_id' => $parent_activity,
+ 'content' => 'depth 1'
+ ) );
+
+ $comment_one_one = bp_activity_new_comment( array(
+ 'user_id' => $u,
+ 'activity_id' => $parent_activity,
+ 'parent_id' => $comment_one,
+ 'content' => 'depth 2'
+ ) );
+
+ $comment_two = bp_activity_new_comment( array(
+ 'user_id' => $u,
+ 'activity_id' => $parent_activity,
+ 'content' => 'depth 1'
+ ) );
+
+ // Pass empty values to bp_activity_delete_comment()
+ $retval = bp_activity_delete_comment( 0, 0 );
+ $this->assertFalse( $retval );
+
+ // Instantiate activity loop, which also includes activity comments.
+ bp_has_activities( 'display_comments=stream' );
+
+ // Activity comments should not be deleted.
+ $this->assertSame( 4, $GLOBALS['activities_template']->activity_count );
+
+ // Clean up after ourselves!
+ $GLOBALS['activities_template'] = null;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @group bp_activity_new_comment
</span><span class="cx" style="display: block; padding: 0 10px"> * @group BP5907
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>