Changeset 8697

Timestamp:

07/27/2014 03:01:26 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Updates to bp_activity_user_can_delete():

• Wrap $can_delete checks is is_user_logged_in() to avoid superfluous processing on activity items when no user is logged in.
• Cast return value to boolean.
• Add some inline documentation.
• Add an empty() check on $activities_template->activity to avoid using it if the global is not setup yet.
• Add some brackets.

File:

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

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

@@ -1636 +1636 @@
         global $activities_template;
 
-        if ( !$activity )
+        // Try to use current activity if none was passed
+        if ( empty( $activity ) && ! empty( $activities_template->activity ) ) {
                 $activity = $activities_template->activity;
-
-        if ( isset( $activity->current_comment ) )
+        }
+
+        // If current_comment is set, we'll use that in place of the main activity
+        if ( isset( $activity->current_comment ) ) {
                 $activity = $activity->current_comment;
-
+        }
+
+        // Assume the user cannot delete the activity item
         $can_delete = false;
 
-        if ( bp_current_user_can( 'bp_moderate' ) )
-                $can_delete = true;
-
-        if ( is_user_logged_in() && $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, $activity );
+        // Only logged in users can delete activity
+        if ( is_user_logged_in() ) {
+
+                // Community moderators can always delete activity (at least for now)
+                if ( bp_current_user_can( 'bp_moderate' ) ) {
+                        $can_delete = true;
+                }
+
+                // Users are allowed to delete their own activity. This is actually
+                // quite powerful, because doing so also deletes all comments to that
+                // activity item. We should revisit this eventually.
+                if ( $activity->user_id === bp_loggedin_user_id() ) {
+                        $can_delete = true;
+                }
+
+                // Viewing a single item, and this user is an admin of that item
+                if ( bp_is_single_item() && bp_is_item_admin() ) {
+                        $can_delete = true;
+                }
+        }
+
+        return (bool) apply_filters( 'bp_activity_user_can_delete', $can_delete, $activity );
 }