Changeset 9052

Timestamp:

09/27/2014 09:39:23 PM (12 years ago)

Author:

imath

Message:

Make sure the parent activity exists before adding a comment to it.

There can be a case when the activity displayed in the stream has been deleted by another user. Adding a comment should not be possible for this particular case as the parent activity does not exist anymore. The patch is adding a check on the date_recorded field of the parent activity before adding a comment. If it is not set, then false is returned and a default message is displayed to the user by bp_legacy_theme_new_activity_comment(). As boonebgorges, some improvements on the message can still be added.

See #5907

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

@@ -1351 +1351 @@
         $activity_id = $r['activity_id'];
 
+        // Get the parent activity
+        $activity  = new BP_Activity_Activity( $activity_id );
+
+        // Bail if the parent activity does not exist
+        if ( empty( $activity->date_recorded ) ) {
+                return false;
+        }
+
         // Check to see if the parent activity is hidden, and if so, hide this comment publically.
-        $activity  = new BP_Activity_Activity( $activity_id );
         $is_hidden = ( (int) $activity->hide_sitewide ) ? 1 : 0;
 
@@ -1662 +1669 @@
                         }
                 }
-                
+
                 // Delete the comment itself
                 bp_activity_delete( array(

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

@@ -724 +724 @@
 
         /**
+         * @group bp_activity_new_comment
+         * @group BP5907
+         */
+        public function test_bp_activity_comment_on_deleted_activity() {
+                $a = $this->factory->activity->create();
+
+                bp_activity_delete_by_activity_id( $a );
+
+                $c = bp_activity_new_comment( array(
+                        'activity_id' => $a,
+                        'parent_id' => $a,
+                        'content' => 'foo',
+                        'user_id' => 1,
+                ) );
+
+                $this->assertEmpty( $c );
+        }
+
+        /**
          * @group favorites
          * @group bp_activity_add_user_favorite