Changeset 6861 for trunk/bp-settings/bp-settings-loader.php

Timestamp:

03/23/2013 07:41:32 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Tweak the logic that determines if the 'delete-account' screen is visible. For 1.7. Props xt4v.

File:

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

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

@@ -126 +126 @@
 
                 // Add Delete Account nav item
-                if ( is_user_logged_in() && ! bp_disable_account_deletion() || bp_current_user_can( 'delete_users' ) ) {
+                if ( ( ! bp_disable_account_deletion() && bp_is_my_profile() ) || bp_current_user_can( 'delete_users' ) ) {
                         $sub_nav[] = array(
                                 'name'            => __( 'Delete Account', 'buddypress' ),
@@ -134 +134 @@
                                 'screen_function' => 'bp_settings_screen_delete_account',
                                 'position'        => 90,
-                                'user_has_access' => bp_is_my_profile() || !is_super_admin( bp_displayed_user_id() )
+                                'user_has_access' => ! is_super_admin( bp_displayed_user_id() )
                         );
                 }