Ticket #20866: django_20866.patch

django/contrib/auth/views.py

@@ -20 +20 @@
 from django.contrib.auth.forms import AuthenticationForm, PasswordResetForm, SetPasswordForm, PasswordChangeForm
 from django.contrib.auth.tokens import default_token_generator
 from django.contrib.sites.models import get_current_site
+from django.contrib import messages
 
 
 @sensitive_post_parameters()
@@ -160 +161 @@
             }
             if is_admin_site:
                 opts = dict(opts, domain_override=request.get_host())
-            form.save(**opts)
-            return HttpResponseRedirect(post_reset_redirect)
+            try:
+                form.save(**opts)
+                return HttpResponseRedirect(post_reset_redirect)
+            except  Exception as e:
+                messages.error(request, "Unable to process your password reset request. Please try again later or contact support.")
+                return HttpResponseRedirect(resolve_url(settings.LOGIN_URL))
+
     else:
         form = password_reset_form()
     context = {