Ticket #8451: fix_password_reset_confirm_path.diff

django/contrib/admin/templates/registration/password_reset_email.html

@@ -4 +4 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/
+{{ protocol }}://{{ domain }}{{ path }}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
 

django/contrib/auth/forms.py

@@ -2 +2 @@
 from django.contrib.auth import authenticate
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import Site
+from django.core.urlresolvers import reverse
 from django.template import Context, loader
 from django import forms
 from django.utils.translation import ugettext_lazy as _
@@ -117 +118 @@
             c = {
                 'email': user.email,
                 'domain': domain,
+                'path': reverse('django.contrib.auth.views.password_reset_confirm',
+                                args=[int_to_base36(user.id), token_generator.make_token(user)]),
                 'site_name': site_name,
-                'uid': int_to_base36(user.id),
                 'user': user,
-                'token': token_generator.make_token(user),
                 'protocol': use_https and 'https' or 'http',
             }
             send_mail(_("Password reset on %s") % site_name,