Ticket #8968: fix-next-redirect.diff

django/contrib/comments/views/moderation.

@@ -9 +9 @@
 from django.contrib.comments import signals
 
 #@login_required
-def flag(request, comment_id, next=None):
+def flag(request, comment_id):
     """
     Flags a comment. Confirmation on GET, action on POST.
 
@@ -34 +34 @@
             created = created,
             request = request,
         )
-        return next_redirect(request.POST.copy(), next, flag_done, c=comment.pk)
+        return next_redirect(request.POST.copy(), None, flag_done, c=comment.pk)
 
     # Render a form on GET
     else:
+        next = request.GET.get('next')
         return render_to_response('comments/flag.html',
             {'comment': comment, "next": next},
             template.RequestContext(request)
@@ -45 +46 @@
 flag = login_required(flag)
 
 #@permission_required("comments.delete_comment")
-def delete(request, comment_id, next=None):
+def delete(request, comment_id):
     """
     Deletes a comment. Confirmation on GET, action on POST. Requires the "can
     moderate comments" permission.
@@ -74 +75 @@
             created = created,
             request = request,
         )
-        return next_redirect(request.POST.copy(), next, delete_done, c=comment.pk)
+        return next_redirect(request.POST.copy(), None, delete_done, c=comment.pk)
 
     # Render a form on GET
     else:
+        next = request.GET.get('next')
         return render_to_response('comments/delete.html',
             {'comment': comment, "next": next},
             template.RequestContext(request)
@@ -85 +87 @@
 delete = permission_required("comments.can_moderate")(delete)
 
 #@permission_required("comments.can_moderate")
-def approve(request, comment_id, next=None):
+def approve(request, comment_id):
     """
     Approve a comment (that is, mark it as public and non-removed). Confirmation
     on GET, action on POST. Requires the "can moderate comments" permission.
@@ -117 +119 @@
             created = created,
             request = request,
         )
-        return next_redirect(request.POST.copy(), next, approve_done, c=comment.pk)
+        return next_redirect(request.POST.copy(), None, approve_done, c=comment.pk)
 
     # Render a form on GET
     else:
+        next = request.GET.get('next')
         return render_to_response('comments/approve.html',
             {'comment': comment, "next": next},
             template.RequestContext(request)