Changeset 6622 for trunk/bp-friends/bp-friends-loader.php

Timestamp:

12/10/2012 06:47:31 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Toggle displayed/logged-in user for sub-nav. Bail if no menu should be available. Add 'user_has_access' checks where applicable. Reverts r6519. Fixes #4661.

File:

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

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

@@ -103 +103 @@
                 );
 
-                $friends_link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() );
+                // Determine user to use
+                if ( bp_displayed_user_domain() ) {
+                        $user_domain = bp_displayed_user_domain();
+                } elseif ( bp_loggedin_user_domain() ) {
+                        $user_domain = bp_loggedin_user_domain();
+                } else {
+                        return;
+                }
+
+                $friends_link = trailingslashit( $user_domain . bp_get_friends_slug() );
 
                 // Add the subnav items to the friends nav item
@@ -123 +132 @@
                         'screen_function' => 'friends_screen_requests',
                         'position'        => 20,
-                        'user_has_access' => bp_is_my_profile()
+                        'user_has_access' => bp_core_can_edit_settings()
                 );