Changeset 4281 for trunk/bp-members/bp-members-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-members/bp-members-loader.php (modified) (2 diffs)

trunk/bp-members/bp-members-loader.php

@@ -144 +144 @@
         global $bp;
 
+        // Stop if there is no user displayed and not logged in
+        if ( !is_user_logged_in() && empty( $bp->displayed_user->id ) )
+            return;
+
         // Add 'Profile' to the main navigation
         if ( !bp_is_active( 'xprofile' ) ) {
@@ -156 +160 @@
 
             // User links
-            $user_domain   = ( isset( $bp->displayed_user->domain ) )               ? $bp->displayed_user->domain               : $bp->loggedin_user->domain;
-            $user_login    = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
+            $user_domain   = ( !empty( $bp->displayed_user->domain ) )               ? $bp->displayed_user->domain               : $bp->loggedin_user->domain;
+            $user_login    = ( !empty( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
             $profile_link  = trailingslashit( $user_domain . $bp->profile->slug );