diff --git a/wp-content/themes/default/comments.php b/wp-content/themes/default/comments.php
index a1dcef1286..685b86d847 100644
--- a/wp-content/themes/default/comments.php
+++ b/wp-content/themes/default/comments.php
@@ -78,8 +78,7 @@
 <p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
 
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
-<?php comment_parent_field(); ?>
+<?php comment_id_fields(); ?>
 </p>
 <?php do_action('comment_form', $post->ID); ?>
 
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 96abd111f4..ae58ad38cc 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -936,8 +936,11 @@ function cancel_comment_reply_link($text = '') {
  *
  * @since 2.7.0
  */
-function comment_parent_field() {
+function comment_id_fields() {
+	global $id;
+
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+	echo "<input type='hidden' name='comment_post_ID' value='$id' />\n";
 	echo "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
 }