Ticket #5575: 5575.02.patch

bp-members/bp-members-functions.php

@@ -1087 +1087 @@
         if ( empty( $user_id ) )
                 $user_id = bp_loggedin_user_id();
 
-        // Bail if account deletion is disabled
-        if ( bp_disable_account_deletion() )
-                return false;
-
         // Site admins cannot be deleted
         if ( is_super_admin( $user_id ) )
                 return false;

bp-settings/bp-settings-actions.php

@@ -333 +333 @@
                 return;
         }
 
+        // Bail if account deletion is disabled
+        if ( bp_disable_account_deletion() && ! bp_current_user_can( 'delete_users' ) ) {
+                return false;
+        }
+
         // Nonce check
         check_admin_referer( 'delete-account' );