Changeset 4281 for trunk/bp-activity/bp-activity-loader.php

Timestamp:

04/24/2011 03:28:18 PM (14 years ago)

Author:

djpaul

Message:

Fix handling of certain subnav URLs in core, xprofile, friends, members, activity, settings, blogs and message components. See #3176

File:

• trunk/bp-activity/bp-activity-loader.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-loader.php

@@ -90 +90 @@
         global $bp;
 
+        // Stop if there is no user displayed
+        if ( empty( $bp->displayed_user->id ) )
+            return;
+
+        // Determine user to use
+        if ( !empty( $bp->displayed_user->domain ) )
+            $user_domain = $bp->displayed_user->domain;
+        else
+            return;
+            
         // Add 'Activity' to the main navigation
         $main_nav = array(
@@ -99 +109 @@
             'item_css_id'         => $this->id
         );
-
-        // Stop if there is no user displayed or logged in
-        if ( !is_user_logged_in() && !isset( $bp->displayed_user->id ) )
-            return;
-
-        // Determine user to use
-        if ( isset( $bp->displayed_user->domain ) )
-            $user_domain = $bp->displayed_user->domain;
-        elseif ( isset( $bp->loggedin_user->domain ) )
-            $user_domain = $bp->loggedin_user->domain;
-        else
-            return;
 
         // User link