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

Merge remote-tracking branch 'upstream/develop' into write-tags

Browse source
This commit is contained in:
Michael 2020-04-28 08:03:26 +00:00
commit 5367620467
8 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,7 +206,7 @@ class Users extends BaseAdmin
$e['register_date'] = Temporal::getRelativeDate($e['register_date']);
$e['login_date'] = Temporal::getRelativeDate($e['login_date']);
$e['last-item'] = Temporal::getRelativeDate($e['last-item']);
$e['lastitem_date'] = Temporal::getRelativeDate($e['last-item']);
$e['is_admin'] = in_array($e['email'], $adminlist);
$e['is_deletable'] = (intval($e['uid']) != local_user());
$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);