Ticket #7450: 7450.02.patch

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

@@ -2963 +2963 @@
                 return $deleted;
         }
 
+        // 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 );
 
@@ -3001 +3007 @@
          * @param int $activity_id The ID of the "root" activity, ie the
          *                         comment's oldest ancestor.
          * @param int $comment_id  The ID of the comment to be deleted.
+         * @return void|bool
          */
         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 false;
+                }
 
                 // Get activity children to delete.
                 $children = BP_Activity_Activity::get_child_comments( $comment_id );

tests/phpunit/testcases/activity/functions.php

@@ -1278 +1278 @@
         }
 
         /**
+         * @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
          */