Skip to content

Commit c6aa58b

Browse files
committed
Enabling locked IP addresses in user views for all eligible users.
1 parent 69dc368 commit c6aa58b

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

app/model/view/UserViewFactory.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private function getUserData(User $user, bool $canViewPrivate, bool $reallyShowE
8686
"isExternal" => $user->hasExternalAccounts(),
8787
"isAllowed" => $user->isAllowed(),
8888
"externalIds" => $this->getExternalIds($user, $reallyShowEverything),
89-
"ipLock" => $user->isIpLocked(),
89+
"ipLock" => $user->isIpLocked() ? $user->getIpLockRaw() : null,
9090
"groupLock" => $user->getGroupLock()?->getId(),
9191
"isGroupLockStrict" => $user->isGroupLockStrict(),
9292
];
@@ -96,8 +96,6 @@ private function getUserData(User $user, bool $canViewPrivate, bool $reallyShowE
9696
$uiData = $user->getUiData();
9797
$privateData["uiData"] = $uiData ? $uiData->getData() : null;
9898
$privateData["settings"] = $user->getSettings();
99-
// ipLock is replaced with actual IP address
100-
$privateData["ipLock"] = $user->isIpLocked() ? $user->getIpLockRaw() : null;
10199
$privateData["ipLockExpiration"] = $user->isIpLocked()
102100
? $user->getIpLockExpiration()?->getTimestamp() : null;
103101
$privateData["groupLockExpiration"] = $user->isGroupLocked()

0 commit comments

Comments
 (0)