Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 02:30:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9512 from MrPetovan/bug/9501-admin-users-fixes

Browse source 
[frio] Improve admin user list display
This commit is contained in:
Michael Vogel 2020-11-10 07:07:59 +01:00 • committed by GitHub
commit 7765bd8e43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Admin/BaseUsers.php
View file

@ -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;