summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-05 15:54:34 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-05 15:54:34 +0200
commit4b7a5b7bfa792d91775821208aaef3be77e3163b (patch)
tree4a7ad2d3d93130474eb41f516ea2f6667e3064a1
parentRevert "Fixed empty display name (content.displayname in a room member can be... (diff)
downloadsynapse-4b7a5b7bfa792d91775821208aaef3be77e3163b.tar.xz
Fixed empty display name (content.displayname in a room member can be null)
-rw-r--r--webclient/components/matrix/matrix-filter.js4
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;
+                }
             }
         }