summary refs log tree commit diff
path: root/webclient/components
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-18 16:22:14 +0100
committerErik Johnston <erik@matrix.org>2014-09-18 16:22:14 +0100
commite0f060d89b9ed82284e3781640fb77257d116753 (patch)
tree93010a33c66d1213c1a6285919cb9eca3f81a8e0 /webclient/components
parentfix wordwrap (diff)
parentBump Changelog and version (diff)
downloadsynapse-e0f060d89b9ed82284e3781640fb77257d116753.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
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 321054f904..c7be65720a 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -189,7 +189,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
                 
                 // always bing if there are 0 bing words... apparently.
                 var bingWords = matrixService.config().bingWords;
-                if (bingWords && bingWords.length === 0) {
+                if (bingWords === undefined || bingWords.length === 0) {
                     shouldBing = true;
                 }