From 2b4736afcd22d7f3d09ece89a8f6458020b27462 Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Wed, 24 Sep 2014 17:42:21 +0200
Subject: Fixed getUserDisplayname when the user has a null displayname

---
 webclient/components/matrix/event-handler-service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webclient')

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;
         }
 
-- 
cgit 1.4.1