Ticket #10026: django_contrib_auth_views.diff

django/contrib/auth/views.py

@@ -116 +116 @@
         raise Http404
 
     user = get_object_or_404(User, id=uid_int)
-    context_instance = RequestContext(request)
+    #context_instance = RequestContext(request)
 
     if token_generator.check_token(user, token):
-        context_instance['validlink'] = True
+        #context_instance['validlink'] = True
+        validlink = True
         if request.method == 'POST':
             form = set_password_form(user, request.POST)
             if form.is_valid():
@@ -128 +129 @@
         else:
             form = set_password_form(None)
     else:
-        context_instance['validlink'] = False
+        #context_instance['validlink'] = False
+        validlink = False
         form = None
-    context_instance['form'] = form    
-    return render_to_response(template_name, context_instance=context_instance)
+    #context_instance['form'] = form    
+    #return render_to_response(template_name, context_instance=context_instance)
+    return render_to_response(template_name, {'validlink': validlink, 'form': form}, context_instance=RequestContext(request))
 
 def password_reset_complete(request, template_name='registration/password_reset_complete.html'):
     return render_to_response(template_name, context_instance=RequestContext(request,