Changeset 11583

Timestamp:

06/09/2017 08:35:52 PM (8 years ago)

Author:

r-a-y

Message:

Activity: Fix activity comment deletion when comment ID equals 0.

In #7394, 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 #7450 (trunk)

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/activity/functions.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-functions.php

@@ -2964 +2964 @@
     }
 
+    // Check if comment still exists.
+    $comment = new BP_Activity_Activity( $comment_id );
+    if ( empty( $comment->id ) ) {
+        return false;
+    }
+
     // Delete any children of this comment.
     bp_activity_delete_children( $activity_id, $comment_id );
@@ -3004 +3010 @@
      */
     function bp_activity_delete_children( $activity_id, $comment_id ) {
+        // Check if comment still exists.
+        $comment = new BP_Activity_Activity( $comment_id );
+        if ( empty( $comment->id ) ) {
+            return;
+        }
 
         // Get activity children to delete.

trunk/tests/phpunit/testcases/activity/functions.php

@@ -1279 +1279 @@
 
     /**
+     * @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;
+    }
+
+    /**
      * @group bp_activity_new_comment
      * @group BP5907