diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-05 15:54:34 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-05 15:54:34 +0200 |
| commit | 4b7a5b7bfa792d91775821208aaef3be77e3163b (patch) | |
| tree | 4a7ad2d3d93130474eb41f516ea2f6667e3064a1 /webclient | |
| parent | Revert "Fixed empty display name (content.displayname in a room member can be... (diff) | |
| download | synapse-4b7a5b7bfa792d91775821208aaef3be77e3163b.tar.xz | |
Fixed empty display name (content.displayname in a room member can be null)
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/components/matrix/matrix-filter.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webclient/components/matrix/matrix-filter.js b/webclient/components/matrix/matrix-filter.js index 0922684e3b..260e0827df 100644 --- a/webclient/components/matrix/matrix-filter.js +++ b/webclient/components/matrix/matrix-filter.js @@ -120,7 +120,9 @@ angular.module('matrixFilter', []) var room = $rootScope.events.rooms[room_id]; if (room && (user_id in room.members)) { var member = room.members[user_id]; - displayName = member.content.displayname; + if (member.content.displayname) { + displayName = member.content.displayname; + } } } |