summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiomfo <giom@matrix.org>2014-10-27 14:16:59 +0100
committergiomfo <giom@matrix.org>2014-10-27 14:17:16 +0100
commitcf1feee21d7c79855a3d4b32f5d282b49f6218f5 (patch)
treeb585e18103d2b5ffffd9d48b69fbfaa465c520f8
parentFix SYWEB-109 : No error if HS rejects the username in registration. (diff)
downloadsynapse-cf1feee21d7c79855a3d4b32f5d282b49f6218f5.tar.xz
HandleRoomMember: handle correctly prev_content
-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 112b3ad96c..e7109c0cb4 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -256,7 +256,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
             // could be a membership change, display name change, etc.
             // Find out which one.
             var memberChanges = undefined;
-            if (event.prev_content && (event.prev_content.membership !== event.content.membership)) {
+            if ((event.prev_content === undefined && event.content.membership) || (event.prev_content && (event.prev_content.membership !== event.content.membership))) {
                 memberChanges = "membership";
             }
             else if (event.prev_content && (event.prev_content.displayname !== event.content.displayname)) {