Changeset 3485

Timestamp:

11/26/2010 04:21:43 PM (16 years ago)

Author:

boonebgorges

Message:

Makes bp_has_activities() respect custom component slugs. Fixes #2588

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (3 diffs)

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

@@ -133 +133 @@
 }
 
+/**
+ * bp_has_activities()
+ *
+ * Initializes the activity loop. 
+ *
+ * Based on the $args passed, bp_has_activities() populates the $activities_template global.
+ *
+ * @package BuddyPress Activity
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ *
+ * @param mixed $args Arguments for limiting the contents of the activity loop. Can be passed as an associative array or as a URL argument string
+ * @return bool Returns true when activities are found
+ */
 function bp_has_activities( $args = '' ) {
         global $bp, $activities_template;
@@ -149 +162 @@
         $primary_id = false;
 
-        /* User filtering */
+        // User filtering
         if ( !empty( $bp->displayed_user->id ) )
                 $user_id = $bp->displayed_user->id;
 
-        /* Group filtering */
+        // Group filtering
         if ( !empty( $bp->groups->current_group ) ) {
                 $object = $bp->groups->id;
@@ -160 +173 @@
                 if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
                         $show_hidden = true;
+        }
+        
+        // The default scope should recognize custom slugs
+        if ( array_key_exists( $bp->current_action, (array)$bp->active_components ) ) {
+                $scope = $bp->active_components[$bp->current_action];
+        } else {
+                $scope = $bp->current_action;
         }