summary refs log tree commit diff
path: root/synapse/storage/room.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 18:24:56 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 18:24:56 +0100
commitb8ab9f1c0a93c2c52f2990c42e5cb27167281694 (patch)
tree039e8304e5b5994f2d94579ce7ef7a60cdad5e9c /synapse/storage/room.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into room_config (diff)
downloadsynapse-b8ab9f1c0a93c2c52f2990c42e5cb27167281694.tar.xz
Add all the necessary checks to make banning work.
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r--synapse/storage/room.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 3b2d1a8ecd..3ca07f4350 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -165,8 +165,7 @@ class RoomStore(SQLBaseStore):
         rows = txn.execute(sql, (room_id, user_id,)).fetchall()
 
         if len(rows) == 1:
-            defer.returnValue(rows[0][0])
-            return
+            return rows[0][0]
 
         sql = (
             "SELECT level FROM room_default_levels as r "