Ticket #5907: 5907.patch

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

@@ -1350 +1350 @@
 
         $activity_id = $r['activity_id'];
 
-        // Check to see if the parent activity is hidden, and if so, hide this comment publically.
+        // 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.
         $is_hidden = ( (int) $activity->hide_sitewide ) ? 1 : 0;
 
         // Insert the activity comment
@@ -1661 +1668 @@
                                 bp_activity_delete_children( $activity_id, $child->id );
                         }
                 }
-                
+
                 // Delete the comment itself
                 bp_activity_delete( array(
                         'secondary_item_id' => $comment_id,