Index: wp-includes/pluggable-functions.php
===================================================================
--- wp-includes/pluggable-functions.php	(revision 3827)
+++ wp-includes/pluggable-functions.php	(working copy)
@@ -243,8 +243,7 @@
 			$q = explode( ini_get('arg_separator.output'), $q);
 			$html .= "\t<form method='post' action='$pagenow'>\n";
 			foreach ( (array) $q as $a ) {
-				$v = substr(strstr($a, '='), 1);
-				$k = substr($a, 0, -(strlen($v)+1));
+				list($k, $v) = explode('=', $a, 2);
 				$html .= "\t\t<input type='hidden' name='" . wp_specialchars( urldecode($k), 1 ) . "' value='" . wp_specialchars( urldecode($v), 1 ) . "' />\n";
 			}
 			$html .= "\t\t<input type='hidden' name='_wpnonce' value='" . wp_create_nonce($action) . "' />\n";
Index: wp-admin/post.php
===================================================================
--- wp-admin/post.php	(revision 3827)
+++ wp-admin/post.php	(working copy)
@@ -322,9 +322,11 @@
 
 case 'editedcomment':
 
-	$comment_id = (int) $_POST['comment_ID'];
-	check_admin_referer('update-comment_' . $comment_id);
+	$comment_ID = (int) $_POST['comment_ID'];
+	$comment_post_ID = (int)  $_POST['comment_post_ID'];
 
+	check_admin_referer('update-comment_' . $comment_ID);
+
 	edit_comment();
 
 	$referredby = $_POST['referredby'];