Changeset 11583 for trunk/src/bp-activity/bp-activity-functions.php

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)

File:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (2 diffs)

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.