diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2024-06-07 12:18:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 12:18:07 +0200 |
| commit | ec0829ad9f8b0a01111b35e16af59ff9c11d7cf8 (patch) | |
| tree | 87b8d98723775498c9a00a025208e9502e9af4a7 /apps | |
| parent | 88c8e244f1efde9dee4a2c8cb37e9c8d2a24d756 (diff) | |
| parent | 74dbc058e8507b9e666537723e83e52bcfa72a17 (diff) | |
| download | nextcloud-server-ec0829ad9f8b0a01111b35e16af59ff9c11d7cf8.tar.gz nextcloud-server-ec0829ad9f8b0a01111b35e16af59ff9c11d7cf8.zip | |
Merge pull request #45589 from nextcloud/backport/36942/stable27
Diffstat (limited to 'apps')
| -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 1e057987eef..b83442669c2 100644 --- a/apps/user_ldap/lib/User/DeletedUsersIndex.php +++ b/apps/user_ldap/lib/User/DeletedUsersIndex.php @@ -64,7 +64,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; |