Index: wp-includes/post-template.php
===================================================================
--- wp-includes/post-template.php	(revision 12541)
+++ wp-includes/post-template.php	(working copy)
@@ -15,8 +15,7 @@
  * @uses $id
  */
 function the_ID() {
-	global $id;
-	echo $id;
+	echo get_the_ID();
 }
 
 /**
@@ -28,8 +27,8 @@
  * @return unknown
  */
 function get_the_ID() {
-	global $id;
-	return $id;
+	global $post;
+	return $post->ID;
 }
 
 /**
@@ -178,7 +177,7 @@
  * @return string
  */
 function get_the_content($more_link_text = null, $stripteaser = 0) {
-	global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
+	global $post, $more, $page, $pages, $multipage, $preview, $pagenow;
 
 	if ( null === $more_link_text )
 		$more_link_text = __( '(more...)' );
@@ -213,10 +212,10 @@
 	$output .= $teaser;
 	if ( count($content) > 1 ) {
 		if ( $more ) {
-			$output .= '<span id="more-' . $id . '"></span>' . $content[1];
+			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
 			if ( ! empty($more_link_text) )
-				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-$id\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-$post->ID\" class=\"more-link\">$more_link_text</a>", $more_link_text );
 			$output = force_balance_tags($output);
 		}