summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorDavid Baker <dbkr@users.noreply.github.com>2016-02-02 14:46:25 +0000
committerDavid Baker <dbkr@users.noreply.github.com>2016-02-02 14:46:25 +0000
commit9039904f4c0c942f67e3ff1eb8e1c88a382d0959 (patch)
treeb155992a130107088aa342fe54ca83fb8defc3ca /synapse/handlers
parentWARN if we get a topo token instead of stream. (diff)
parentPass make_guest whne we autogen a user ID (diff)
downloadsynapse-9039904f4c0c942f67e3ff1eb8e1c88a382d0959.tar.xz
Merge pull request #548 from matrix-org/dbkr/fix_guest_db_column
Pass make_guest when we autogen a user ID
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/register.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index c11b98d0b7..abd1a16a41 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -139,7 +139,9 @@ class RegistrationHandler(BaseHandler):
                     yield self.store.register(
                         user_id=user_id,
                         token=token,
-                        password_hash=password_hash)
+                        password_hash=password_hash,
+                        make_guest=make_guest
+                    )
 
                     yield registered_user(self.distributor, user)
                 except SynapseError: