Ticket #11611: prefix_for_comment.2.diff

django/contrib/comments/forms.py

@@ -22 +22 @@
     timestamp     = forms.IntegerField(widget=forms.HiddenInput)
     security_hash = forms.CharField(min_length=40, max_length=40, widget=forms.HiddenInput)
 
-    def __init__(self, target_object, data=None, initial=None):
+    def __init__(self, target_object, data=None, initial=None,**kwargs):
         self.target_object = target_object
         if initial is None:
             initial = {}
         initial.update(self.generate_security_data())
-        super(CommentSecurityForm, self).__init__(data=data, initial=initial)
+        super(CommentSecurityForm, self).__init__(data=data, initial=initial,**kwargs)
         
     def security_errors(self):
         """Return just those errors associated with security"""
@@ -40 +40 @@
     def clean_security_hash(self):
         """Check the security hash."""
         security_hash_dict = {
-            'content_type' : self.data.get("content_type", ""),
-            'object_pk' : self.data.get("object_pk", ""),
-            'timestamp' : self.data.get("timestamp", ""),
+            'content_type' : self.cleaned_data.get("content_type", ""),
+            'object_pk' : self.cleaned_data.get("object_pk", ""),
+            'timestamp' : str(self.cleaned_data.get("timestamp", "")),
         }
         expected_hash = self.generate_security_hash(**security_hash_dict)
         actual_hash = self.cleaned_data["security_hash"]