Changeset 3563

Timestamp:

12/22/2010 02:46:17 PM (14 years ago)

Author:

boonebgorges

Message:

Refines the check to see whether a user has permissions to delete an activity item. Fixes #2770

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -611 +611 @@
 
         // Add the delete link if the user has permission on this item
-        if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_super_admin )
+        if ( bp_activity_user_can_delete() )
              $content .= apply_filters( 'bp_activity_delete_link', ' · ' . bp_get_activity_delete_link(), $activities_template->activity );
 
         return apply_filters( 'bp_insert_activity_meta', $content );
     }
+
+function bp_activity_user_can_delete() {
+    global $activities_template, $bp;
+
+    if ( !is_user_logged_in() )
+        $can_delete = false;
+    
+    if ( $bp->loggedin_user->is_super_admin )
+        $can_delete = true;
+    
+    if ( $activities_template->activity->user_id == $bp->loggedin_user->id )
+        $can_delete = true;
+        
+    if ( $bp->is_item_admin && $bp->is_single_item )
+        $can_delete = true;
+    
+    return apply_filters( 'bp_activity_user_can_delete', $can_delete );
+}
 
 function bp_activity_parent_content( $args = '' ) {