Index: wp-admin/comment.php
===================================================================
--- wp-admin/comment.php	(revision 3825)
+++ wp-admin/comment.php	(working copy)
@@ -184,15 +184,17 @@
 
 case 'editedcomment':
 
-	check_admin_referer('update-comment');
+	$comment_id = (int) $_POST['comment_ID'];
 
+	check_admin_referer('update-comment_' . $comment_id);
+
 	edit_comment();
 
 	$referredby = $_POST['referredby'];
 	if (!empty($referredby)) {
 		header('Location: ' . $referredby);
 	} else {
-		header ("Location: edit.php?p=$comment_post_ID&c=1#comments");
+		header ("Location: edit.php?p=$comment_id&c=1#comments");
 	}
 
 	break;
Index: wp-admin/edit-form-comment.php
===================================================================
--- wp-admin/edit-form-comment.php	(revision 3825)
+++ wp-admin/edit-form-comment.php	(working copy)
@@ -6,7 +6,7 @@
 ?>
 
 <form name="post" action="comment.php" method="post" id="post">
-<?php wp_nonce_field('update-comment' . $comment->comment_ID) ?>
+<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
 <div class="wrap">
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />