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

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

@@ -160 +160 @@
         );
 
-        $profile_link = trailingslashit( bp_loggedin_user_domain() . $this->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;
+        }
+
+        $profile_link = trailingslashit( $user_domain . $this->slug );
 
         // Add the subnav items to the profile
@@ -172 +181 @@
         );
 
-        if ( bp_is_my_profile() ) {
-            // Edit Profile
-            $sub_nav[] = array(
-                'name'            => __( 'Edit', 'buddypress' ),
-                'slug'            => 'edit',
-                'parent_url'      => $profile_link,
-                'parent_slug'     => $this->slug,
-                'screen_function' => 'xprofile_screen_edit_profile',
-                'position'        => 20
-            );
-
-            // Change Avatar
-            $sub_nav[] = array(
-                'name'            => __( 'Change Avatar', 'buddypress' ),
-                'slug'            => 'change-avatar',
-                'parent_url'      => $profile_link,
-                'parent_slug'     => $this->slug,
-                'screen_function' => 'xprofile_screen_change_avatar',
-                'position'        => 30
-            );
-        }
+        // Edit Profile
+        $sub_nav[] = array(
+            'name'            => __( 'Edit', 'buddypress' ),
+            'slug'            => 'edit',
+            'parent_url'      => $profile_link,
+            'parent_slug'     => $this->slug,
+            'screen_function' => 'xprofile_screen_edit_profile',
+            'position'        => 20,
+            'user_has_access' => bp_core_can_edit_settings()
+        );
+
+        // Change Avatar
+        $sub_nav[] = array(
+            'name'            => __( 'Change Avatar', 'buddypress' ),
+            'slug'            => 'change-avatar',
+            'parent_url'      => $profile_link,
+            'parent_slug'     => $this->slug,
+            'screen_function' => 'xprofile_screen_change_avatar',
+            'position'        => 30,
+            'user_has_access' => bp_core_can_edit_settings()
+        );
 
         parent::setup_nav( $main_nav, $sub_nav );