diff options
author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-05-30 18:09:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-30 18:09:49 +0200 |
commit | dee0eb2f0b4e761bbd033794dbe616f28a0be98f (patch) | |
tree | 27161dbdadf70a59af9b848459b1c62157906563 | |
parent | 6438d9500938d41724922c472d84d550d764969b (diff) | |
parent | 61a60137987aa5922534e1eae876b2f6638797e1 (diff) | |
download | nextcloud-server-dee0eb2f0b4e761bbd033794dbe616f28a0be98f.tar.gz nextcloud-server-dee0eb2f0b4e761bbd033794dbe616f28a0be98f.zip |
Merge pull request #36942 from nextcloud/unmark-login-date
-rw-r--r-- | apps/user_ldap/lib/User/DeletedUsersIndex.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/User/DeletedUsersIndex.php b/apps/user_ldap/lib/User/DeletedUsersIndex.php index d679ca86d93..a74eb663313 100644 --- a/apps/user_ldap/lib/User/DeletedUsersIndex.php +++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php @@ -56,7 +56,12 @@ class DeletedUsersIndex { $userObjects = []; foreach ($deletedUsers as $user) { - $userObjects[] = new OfflineUser($user, $this->config, $this->mapping, $this->shareManager); + $userObject = new OfflineUser($user, $this->config, $this->mapping, $this->shareManager); + if ($userObject->getLastLogin() > $userObject->getDetectedOn()) { + $userObject->unmark(); + } else { + $userObjects[] = $userObject; + } } $this->deletedUsers = $userObjects; |