Changeset 6519

Timestamp:

11/14/2012 08:29:28 PM (13 years ago)

Author:

djpaul

Message:

Only register subnav items if user has appropriate authorisation. See #4661

Location:

trunk

Files:

• 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-messages/bp-messages-loader.php

@@ -101 +101 @@
     function setup_nav() {
 
+        if ( ! bp_is_my_profile() )
+            return;
+
         $sub_nav = array();
         $name    = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );

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

@@ -125 +125 @@
 
         // Add Delete Account nav item
-        if ( ! bp_disable_account_deletion() || bp_current_user_can( 'delete_users' ) ) {
+        if ( is_user_logged_in() && ! bp_disable_account_deletion() || bp_current_user_can( 'delete_users' ) ) {
             $sub_nav[] = array(
                 'name'            => __( 'Delete Account', 'buddypress' ),

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

@@ -172 +172 @@
         );
 
-        // 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
-        );
+        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
+            );
+        }
 
         parent::setup_nav( $main_nav, $sub_nav );