Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

register: Fix using subdomains logic when subdomains is disabled.

This commit is contained in:
Tim Abbott 2016-11-03 12:33:46 -07:00
parent fa6aafd0a5
commit 08ce391611
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/views/__init__.py
View File

@ -118,7 +118,7 @@ def accounts_register(request):
# realm.
domain = prereg_user.realm.domain
realm = get_realm(domain)
else:
elif settings.REALMS_HAVE_SUBDOMAINS:
subdomain_realm = resolve_subdomain_to_realm(get_subdomain(request))
domain = resolve_email_to_domain(email)
domain = subdomain_realm.domain if subdomain_realm else domain
@ -135,6 +135,9 @@ def accounts_register(request):
return render_to_response("zerver/completely_open_link.html", ctx)
else:
realm = get_realm(domain)
else:
domain = resolve_email_to_domain(email)
realm = get_realm(domain)
if realm and realm.deactivated: