Changeset 9937

Timestamp:

06/11/2015 07:03:00 AM (11 years ago)

Author:

johnjamesjacoby

Message:

XProfile: applies changes to BP_XProfile_Component::setup_nav() that did not apply in r9936.

This change brings XProfile's navigation setup method into alignment with all other component's similar methods, and finishes what r9936 started.

File:

• trunk/src/bp-xprofile/bp-xprofile-loader.php (modified) (4 diffs)

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

@@ -181 +181 @@
                 }
 
-                $slug         = 
-                $profile_link = trailingslashit( $user_domain . $this->slug );
+                $access       = bp_core_can_edit_settings();
+                $slug         = bp_get_profile_slug();
+                $profile_link = trailingslashit( $user_domain . $slug );
 
                 // Add 'Profile' to the main navigation
                 $main_nav = array(
                         'name'                => _x( 'Profile', 'Profile header menu', 'buddypress' ),
-                        'slug'                => $this->slug,
+                        'slug'                => $slug,
                         'position'            => 20,
                         'screen_function'     => 'xprofile_screen_display_profile',
@@ -199 +200 @@
                         'slug'            => 'public',
                         'parent_url'      => $profile_link,
-                        'parent_slug'     => $this->slug,
+                        'parent_slug'     => $slug,
                         'screen_function' => 'xprofile_screen_display_profile',
                         'position'        => 10
@@ -209 +210 @@
                         'slug'            => 'edit',
                         'parent_url'      => $profile_link,
-                        'parent_slug'     => $this->slug,
+                        'parent_slug'     => $slug,
                         'screen_function' => 'xprofile_screen_edit_profile',
                         'position'        => 20,
-                        'user_has_access' => bp_core_can_edit_settings()
+                        'user_has_access' => $access
                 );
 
@@ -221 +222 @@
                                 'slug'            => 'change-avatar',
                                 'parent_url'      => $profile_link,
-                                'parent_slug'     => $this->slug,
+                                'parent_slug'     => $slug,
                                 'screen_function' => 'xprofile_screen_change_avatar',
                                 'position'        => 30,
-                                'user_has_access' => bp_core_can_edit_settings()
+                                'user_has_access' => $access
                         );
                 }