Changeset 4548

Timestamp:

06/21/2011 07:22:17 PM (15 years ago)

Author:

djpaul

Message:

Fix deleting activity stream items. Fixes #3272

Location:

trunk

Files:

• bp-activity/bp-activity-actions.php (modified) (1 diff)
• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-themes/bp-default/_inc/ajax.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -100 +100 @@
 
         // Check access
-        if ( !bp_activity_user_can_delete() )
+        if ( empty( $activity->user_id ) || !bp_activity_user_can_delete( $activity ) )
                 return false;
 

trunk/bp-activity/bp-activity-template.php

@@ -717 +717 @@
         }
 
-function bp_activity_user_can_delete() {
+function bp_activity_user_can_delete( $activity = false ) {
         global $activities_template, $bp;
+
+        if ( !$activity )
+                $activity = $activities_template->activity;
 
         $can_delete = false;
@@ -725 +728 @@
                 $can_delete = true;
 
-        if ( $activities_template->activity->user_id == $bp->loggedin_user->id )
+        if ( $activity->user_id == $bp->loggedin_user->id )
                 $can_delete = true;
 

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -241 +241 @@
         }
 
-        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) )
-                return false;
+        if ( empty( $_POST['id'] ) || !is_numeric( $_POST['id'] ) ) {
+                echo '-1';
+                return false;
+        }
 
         $activity = new BP_Activity_Activity( (int) $_POST['id'] );
 
         // Check access
-        if ( !bp_activity_user_can_delete() )
-                return false;
+        if ( empty( $activity->user_id ) || !bp_activity_user_can_delete( $activity ) ) {
+                echo '-1';
+                return false;
+        }
 
         // Call the action before the delete so plugins can still fetch information about it
@@ -257 +261 @@
                 return false;
         }
-        
+
         do_action( 'bp_activity_action_delete_activity', $activity->id, $activity->user_id );