summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-16 16:31:16 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-16 16:31:16 +0100
commitd6c0cff3bdf5de6229d10503520535076c8aae5d (patch)
treec66f39377b42b685a0ff5d6494b9fd2cfafe436b /webclient/components
parentDon't bing for sent messages. Handle cases where the member is unknown rather... (diff)
downloadsynapse-d6c0cff3bdf5de6229d10503520535076c8aae5d.tar.xz
Bugfix when content isn't a string.
Diffstat (limited to 'webclient/components')
-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 55e8480a19..258de9a31e 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -51,7 +51,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
     // bit strange to put the impl in this service though, but I can't think of a better
     // file to put it in.
     $rootScope.containsBingWord = function(content) {
-        if (!content) {
+        if (!content || $.type(content) != "string") {
             return false;
         }
         var bingWords = matrixService.config().bingWords;