Merge pull request #117 from acdervis/develop

Fixed userids being sent out for password reset having wrong bit tag. Wa...
evewspace · Jan 7, 2015 · 9edc272 · 9edc272
2 parents 9c89bfd + 4070a4c
commit 9edc272
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/evewspace/account/templates/password_reset_email.html b/evewspace/account/templates/password_reset_email.html
@@ -1,3 +1,3 @@
 {% load url from future %}
 Password reset link for {{ user }}
-{{ protocol}}://{{ domain }}{% url 'password_reset_confirm' uidb36=uid token=token %}
+{{ protocol}}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
diff --git a/evewspace/account/urls.py b/evewspace/account/urls.py
@@ -61,7 +61,7 @@
          'subject_template_name': 'reset_subject.txt'}, name='password_reset'),
     url(r'^password/reset/done$', 'django.contrib.auth.views.password_reset_done',
         {'template_name': 'password_reset_done.html'}, name='password_reset_done'),
-    url(r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)',
+    url(r'^password/reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)',
         'account.views.password_reset_confirm',
         name='password_reset_confirm'),
 )