diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2020-06-10 13:39:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-10 13:39:22 +0300 |
commit | 06fdd1dab7b6622e5500245d377049015278452c (patch) | |
tree | 1dfe454787f8e2083e42007780d0322f008333ae /lib | |
parent | 0d80c0bae00dfeb95dc780e0166ea0e28e2b5bb7 (diff) | |
parent | c50be21cda2c1b2a09c19ee42d7cefe417be731d (diff) |
Merge pull request #3791 from nextcloud/backport/3789/stable19
[stable19] Fix user timeout with numeric ids
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Controller/RoomController.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 956b9f5b9..ae071a028 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -848,17 +848,18 @@ class RoomController extends AEnvironmentAwareController { $results = []; foreach ($participants['users'] as $userId => $participant) { + $userId = (string) $userId; if ($participant['sessionId'] !== '0' && $participant['lastPing'] <= $maxPingAge) { $this->room->leaveRoom($userId); } - $user = $this->userManager->get((string) $userId); + $user = $this->userManager->get($userId); if (!$user instanceof IUser) { continue; } $results[] = array_merge($participant, [ - 'userId' => (string) $userId, + 'userId' => $userId, 'displayName' => (string) $user->getDisplayName(), ]); } |