Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix password recovery URLs

Roland Geider4f19ff48b455
diff --git a/wger/core/templates/user/password_reset_email.html b/wger/core/templates/user/password_reset_email.html
index 4b1a8e4b3..d46952224 100644
--- a/wger/core/templates/user/password_reset_email.html
+++ b/wger/core/templates/user/password_reset_email.html
@@ -3,7 +3,7 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'core:password_reset_confirm' uidb36=uid token=token %}
+{{ protocol }}://{{ domain }}{% url 'core:password_reset_confirm' uidb64=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 4e390567f..da33ee49d 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -113,7 +113,7 @@ urlpatterns = urlpatterns + patterns('',
{'template_name': 'user/password_reset_done.html'},
name='password_reset_done'),
- url(r'^user/password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)-(?P<token>.+)/$',
+ url(r'^user/password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
views.password_reset_confirm,
{'template_name': 'user/password_reset_confirm.html',
'post_reset_redirect': reverse_lazy('core:password_reset_complete')},