Merge branch 'master' of github.com:matrix-org/synapse into develop

4 files changed, 10 insertions, 3 deletions

diff --git a/CHANGES.rst b/CHANGES.rst

index edf32db752..9e884e51bf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse 0.3.2 (2014-09-18)
+=====================================
+
+Webclient:
+ * Fix bug where an empty "bing words" list in old accounts didn't send
+   notifications when it should have done.
+
 Changes in synapse 0.3.1 (2014-09-18)
 =====================================
 This is a release to hotfix v0.3.0 to fix two regressions.
diff --git a/VERSION b/VERSION

index 9e11b32fca..d15723fbe8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.1
+0.3.2
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 1b49cbb38e..0dbad9a0de 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
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;
                 }