diff options
| author | Joas Schilling <coding@schilljs.com> | 2021-01-21 12:49:24 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2021-01-21 12:49:24 +0300 |
| commit | 6a019ed418f86185fb19ca520dc576f128758fcb (patch) | |
| tree | 82a2a6b5ff6b46770da84c61d92f5e7063bd6471 /lib | |
| parent | 93fcd525ecd7c93aa640613d4449bcff7c5fb678 (diff) | |
Fix "Argument 1 passed to Room::getDisplayName() must be of the type string"
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Controller/RoomController.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 934a0566f..ed78d71d6 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -608,7 +608,7 @@ class RoomController extends AEnvironmentAwareController { ) { return array_merge($roomData, [ 'name' => $room->getName(), - 'displayName' => $room->getDisplayName($isSIPBridgeRequest ? '' : $this->userId), + 'displayName' => $room->getDisplayName($isSIPBridgeRequest || $this->userId === null ? '' : $this->userId), 'objectType' => $room->getObjectType(), 'objectId' => $room->getObjectId(), 'readOnly' => $room->getReadOnly(), |