Changeset 15549 for trunk/wp-includes/post-template.php

Timestamp:

08/28/2010 11:57:28 AM (13 years ago)

Author:

scribu

Message:

Don't use the global anymore. Fixes #11624

File:

• trunk/wp-includes/post-template.php (modified) (4 diffs)

trunk/wp-includes/post-template.php

@@ -13 +13 @@
  *
  * @since 0.71
- * @uses $id
  */
 function the_ID() {
-    global $id;
-    echo $id;
+    echo get_the_ID();
 }
 
@@ -24 +22 @@
  *
  * @since 2.1.0
- * @uses $id
- *
- * @return unknown
+ * @uses $post
+ *
+ * @return int
  */
 function get_the_ID() {
-    global $id;
-    return $id;
+    global $post;
+    return $post->ID;
 }
 
@@ -182 +180 @@
  */
 function get_the_content($more_link_text = null, $stripteaser = 0) {
-    global $id, $post, $more, $page, $pages, $multipage, $preview;
+    global $post, $more, $page, $pages, $multipage, $preview;
 
     if ( null === $more_link_text )
@@ -217 +215 @@
     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);
         }