Changeset 4281

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

Location:

trunk

Files:

• bp-activity/bp-activity-loader.php (modified) (2 diffs)
• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-core/bp-core-component.php (modified) (1 diff)
• bp-friends/bp-friends-loader.php (modified) (1 diff)
• bp-members/bp-members-loader.php (modified) (2 diffs)
• bp-messages/bp-messages-loader.php (modified) (1 diff)
• bp-settings/bp-settings-loader.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-loader.php (modified) (1 diff)

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

trunk/bp-blogs/bp-blogs-loader.php

@@ -102 +102 @@
          */
         if ( !is_multisite() )
-            return false;
+            return;
+
+        // Stop if there is no user displayed
+        if ( empty( $bp->displayed_user->id ) )
+            return;
 
         // Add 'Blogs' to the main navigation
-        $main_nav =  array(
+        $main_nav = array(
             'name'                => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
             'slug'                => $this->slug,

trunk/bp-core/bp-core-component.php

@@ -222 +222 @@
      */
     function _setup_nav( $main_nav = '', $sub_nav = '' ) {
-
         // No sub nav items without a main nav item
         if ( !empty( $main_nav ) ) {

trunk/bp-friends/bp-friends-loader.php

@@ -92 +92 @@
     function _setup_nav() {
         global $bp;
+
+        // Stop if there is no user displayed
+        if ( empty( $bp->displayed_user->id ) )
+            return;
 
         // Add 'Friends' to the main navigation

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 );
 

trunk/bp-messages/bp-messages-loader.php

@@ -93 +93 @@
         global $bp;
 
+        // Stop if there is no user displayed
+        if ( empty( $bp->displayed_user->id ) )
+            return;
+
         if ( $count = messages_get_unread_count() )
             $name = sprintf( __( 'Messages <strong>(%s)</strong>', 'buddypress' ), $count );

trunk/bp-settings/bp-settings-loader.php

@@ -68 +68 @@
     function _setup_nav() {
         global $bp;
+
+        // Stop if there is no user displayed
+        if ( empty( $bp->displayed_user->id ) )
+            return;
 
         // Add the settings navigation item

trunk/bp-xprofile/bp-xprofile-loader.php

@@ -111 +111 @@
         global $bp;
 
+        // Stop if there is no user displayed
+        if ( empty( $bp->displayed_user->id ) )
+            return;
+
         // Add 'Profile' to the main navigation
         $main_nav = array(