Changeset 1021 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

02/06/2009 03:07:48 AM (16 years ago)

Author:

apeatling

Message:

Converted $bp as an array to $bp as an object. See this post for more info: http://buddypress.org/forums/topic.php?id=1125

File:

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

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

@@ -24 +24 @@
         
         if ( !$user_id )
-            $user_id = $bp['current_userid'];
-
-        if ( $bp['current_component'] != $bp['activity']['slug'] || ( $bp['current_component'] == $bp['activity']['slug'] && $bp['current_action'] == 'just-me' || $bp['current_action'] == 'feed' ) ) {
+            $user_id = $bp->displayed_user->id;
+
+        if ( $bp->current_component != $bp->activity->slug || ( $bp->current_component == $bp->activity->slug && $bp->current_action == 'just-me' || $bp->current_action == 'feed' ) ) {
             $this->activities = BP_Activity_Activity::get_activity_for_user( $user_id, $limit );
         } else {
@@ -34 +34 @@
         $this->activity_count = count($this->activities);
     
-        $this->full_name = $bp['current_fullname'];
+        $this->full_name = $bp->displayed_user->fullname;
 
         $this->is_home = bp_is_home();
@@ -99 +99 @@
     global $bp, $activities_template, $bp_activity_user_id, $bp_activity_limit;
     
-    if ( $bp['current_action'] == 'my-friends' )
+    if ( $bp->current_action == 'my-friends' )
         $filter_content = false;
     else
@@ -105 +105 @@
     
     if ( !$bp_activity_user_id )
-        $bp_activity_user_id = $bp['current_userid'];
+        $bp_activity_user_id = $bp->displayed_user->id;
     
     if ( !$bp_activity_limit )
@@ -200 +200 @@
     global $bp;
     
-    echo apply_filters( 'bp_sitewide_activity_feed_link', site_url() . '/' . $bp['activity']['slug'] . '/feed' );
+    echo apply_filters( 'bp_sitewide_activity_feed_link', site_url() . '/' . $bp->activity->slug . '/feed' );
 }
 
@@ -206 +206 @@
     global $bp;
     
-    if ( ( $bp['current_component'] == $bp['profile']['slug'] ) || $bp['current_action'] == 'just-me' )
-        echo apply_filters( 'bp_activities_member_rss_link', $bp['current_domain'] . $bp['activity']['slug'] . '/feed' );
+    if ( ( $bp->current_component == $bp->profile->slug ) || $bp->current_action == 'just-me' )
+        echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
     else
-        echo apply_filters( 'bp_activities_member_rss_link', $bp['current_domain'] . $bp['activity']['slug'] . '/my-friends/feed' );        
+        echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/my-friends/feed' );      
 }