From b8b8cf94e8b7575ec523d67347f9ddf8746f7e7e Mon Sep 17 00:00:00 2001 From: Todd Dembrey <todd.dembrey@torchbox.com> Date: Tue, 28 Aug 2018 13:05:48 +0100 Subject: [PATCH] Make sure the account reset email goes to the correct site --- opentech/apply/users/templates/users/password_reset/email.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentech/apply/users/templates/users/password_reset/email.txt b/opentech/apply/users/templates/users/password_reset/email.txt index 30d6aa5aa..58e179542 100644 --- a/opentech/apply/users/templates/users/password_reset/email.txt +++ b/opentech/apply/users/templates/users/password_reset/email.txt @@ -1,6 +1,6 @@ {% load i18n wagtailadmin_tags %}{% base_url_setting as base_url %} {% trans "Please follow the link below to reset your password:" %} -{% if base_url %}{{ base_url }}{% else %}{{ protocol }}://{{ domain }}{% endif %}{% url 'users:password_reset_confirm' uidb64=uid token=token %} +{% if site.root_url %}{{ site.root_url }}{% else %}{{ base_url }}{% endif %}{% url 'users:password_reset_confirm' uidb64=uid token=token %} {% if user.USERNAME_FIELD != "email" %} {% trans "Your username (in case you've forgotten):" %} {{ user.get_username }} -- GitLab