From 54f7da3a27b12d35373e384ca4b1b27fa3bd1482 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 26 Jun 2008 04:09:29 +0000 Subject: [PATCH] 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 --- django/contrib/auth/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py index ec7f0c8f837..9f447155ae9 100644 --- a/django/contrib/auth/views.py +++ b/django/contrib/auth/views.py @@ -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))