summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-24 17:42:21 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-24 17:42:40 +0200
commit2b4736afcd22d7f3d09ece89a8f6458020b27462 (patch)
tree5b0418b14d0172bcbeaca886743ebabd6bddafd5 /webclient
parentSYN-70: And fix another bug where I can't type (diff)
downloadsynapse-2b4736afcd22d7f3d09ece89a8f6458020b27462.tar.xz
Fixed getUserDisplayname when the user has a null displayname
Diffstat (limited to 'webclient')
-rw-r--r--webclient/components/matrix/event-handler-service.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 5c332d5cd9..ea52db4f4a 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -371,7 +371,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
 
         // Get the user display name from the member list of the room
         var member = getMember(room_id, user_id);
-        if (member) {
+        if (member && member.content.displayname) { // Do not consider null displayname
             displayName = member.content.displayname;
         }