From 4b7a5b7bfa792d91775821208aaef3be77e3163b Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Fri, 5 Sep 2014 15:54:34 +0200
Subject: [PATCH] Fixed empty display name (content.displayname in a room
 member can be null)

---
 webclient/components/matrix/matrix-filter.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
+                }
             }
         }
         
-- 
GitLab