Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7274 -- Improved the django.contrib.auth password_reset() view…

… not to require the Sites framework. Thanks, joshrl

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 54f7da3a27b12d35373e384ca4b1b27fa3bd1482 1 parent 2b926d4
Adrian Holovaty adrianholovaty authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 django/contrib/auth/views.py
5 django/contrib/auth/views.py
View
@@ -75,7 +75,10 @@ def password_reset(request, is_admin_site=False, template_name='registration/pas
if is_admin_site:
form.save(domain_override=request.META['HTTP_HOST'])
else:
- form.save(email_template_name=email_template_name)
+ if Site._meta.installed:
+ form.save(email_template_name=email_template_name)
+ else:
+ form.save(domain_override=RequestSite(request).domain, email_template_name=email_template_name)
return HttpResponseRedirect('%sdone/' % request.path)
return render_to_response(template_name, {'form': oldforms.FormWrapper(form, new_data, errors)},
context_instance=RequestContext(request))
Please sign in to comment.
Something went wrong with that request. Please try again.