From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Mon, 9 Nov 2020 03:02:15 +0000 (-0500)
Subject: Improve admin user field is_deletable to check user.account_removed
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a35707ec8fcce9fdc39d1b6a168da7562ae7e834;p=friendica.git

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 97b10f41fb..37f7acdf62 100644
--- 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;