Improve admin user field is_deletable to check user.account_removed

diff --git a/src/Module/Admin/BaseUsers.php b/src/Module/Admin/BaseUsers.php
index 97b10f41fbc6d3f866812cd27c8683fa42026ac2..37f7acdf62e76d74a006cd8c0e0fde124bbcfb50 100644 (file)
--- a/src/Module/Admin/BaseUsers.php
+++ b/src/Module/Admin/BaseUsers.php
@@ -120,7 +120,7 @@ abstract class BaseUsers extends BaseAdmin
                        $user['login_date'] = Temporal::getRelativeDate($user['login_date']);
                        $user['lastitem_date'] = Temporal::getRelativeDate($user['last-item']);
                        $user['is_admin'] = in_array($user['email'], $adminlist);
-                       $user['is_deletable'] = (intval($user['uid']) != local_user());
+                       $user['is_deletable'] = !$user['account_removed'] && intval($user['uid']) != local_user();
                        $user['deleted'] = ($user['account_removed'] ? Temporal::getRelativeDate($user['account_expires_on']) : False);
 
                        return $user;