Changeset 15549

Timestamp:

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

Author:

scribu

Message:

Don't use the global anymore. Fixes #11624

Location:

trunk/wp-includes

Files:

• comment-template.php (modified) (8 diffs)
• link-template.php (modified) (1 diff)
• post-template.php (modified) (4 diffs)
• post-thumbnail-template.php (modified) (3 diffs)
• post.php (modified) (2 diffs)

trunk/wp-includes/comment-template.php

@@ -546 +546 @@
  */
 function get_comments_number( $post_id = 0 ) {
-        global $id;
-        $post_id = (int) $post_id;
-
         if ( !$post_id )
-                $post_id = (int) $id;
+                $post_id = get_the_ID();
+
+        $post_id = absint($post_id);
 
         $post = get_post($post_id);
@@ -565 +564 @@
  *
  * @since 0.71
- * @uses $id
  * @uses apply_filters() Calls the 'comments_number' hook on the output and number of comments respectively.
  *
@@ -574 +572 @@
  */
 function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-        global $id;
-
         if ( !empty( $deprecated ) )
                 _deprecated_argument( __FUNCTION__, '1.3' );
 
-        $number = get_comments_number($id);
+        $number = get_comments_number(get_the_ID());
 
         if ( $number > 1 )
@@ -704 +700 @@
  * @since 1.5.0
  * @uses apply_filters() Calls 'trackback_url' on the resulting trackback URL
- * @uses $id
  *
  * @return string The trackback URL after being filtered
  */
 function get_trackback_url() {
-        global $id;
         if ( '' != get_option('permalink_structure') ) {
                 $tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
         } else {
-                $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
+                $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
         }
         return apply_filters('trackback_url', $tb_url);
@@ -845 +839 @@
  * @global array $comment List of comment objects for the current post
  * @uses $wpdb
- * @uses $id
  * @uses $post
  * @uses $withcomments Will not try to get the comments if the post has none.
@@ -962 +955 @@
  *
  * @since 0.71
- * @uses $id
  * @uses $wpcommentspopupfile
  * @uses $wpcommentsjavascript
@@ -975 +967 @@
  */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-        global $id, $wpcommentspopupfile, $wpcommentsjavascript;
+        global $wpcommentspopupfile, $wpcommentsjavascript;
+
+        $id = get_the_ID();
 
         if ( false === $zero ) $zero = __( 'No Comments' );
@@ -1169 +1163 @@
  */
 function get_comment_id_fields() {
-        global $id;
+        $id = get_the_ID();
 
         $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;

trunk/wp-includes/link-template.php

@@ -463 +463 @@
  */
 function get_post_comments_feed_link($post_id = '', $feed = '') {
-        global $id;
-
-        if ( empty($post_id) )
-                $post_id = (int) $id;
+        if ( !$post_id )
+                $post_id = get_the_ID();
+
+        $post_id = absint($post_id);
 
         if ( empty($feed) )

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);
                 }

trunk/wp-includes/post-thumbnail-template.php

@@ -19 +19 @@
  */
 function has_post_thumbnail( $post_id = NULL ) {
-        global $id;
-        $post_id = ( NULL === $post_id ) ? $id : $post_id;
+        $post_id = ( NULL === $post_id ) ? get_the_ID() : $post_id;
         return !! get_post_thumbnail_id( $post_id );
 }
@@ -33 +32 @@
  */
 function get_post_thumbnail_id( $post_id = NULL ) {
-        global $id;
-        $post_id = ( NULL === $post_id ) ? $id : $post_id;
+        $post_id = ( NULL === $post_id ) ? get_the_ID() : $post_id;
         return get_post_meta( $post_id, '_thumbnail_id', true );
 }
@@ -60 +58 @@
  */
 function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) {
-        global $id;
-        $post_id = ( NULL === $post_id ) ? $id : $post_id;
+        $post_id = ( NULL === $post_id ) ? get_the_ID() : $post_id;
         $post_thumbnail_id = get_post_thumbnail_id( $post_id );
         $size = apply_filters( 'post_thumbnail_size', $size );

trunk/wp-includes/post.php

@@ -1269 +1269 @@
  */
 function get_post_custom($post_id = 0) {
-        global $id;
-
         if ( !$post_id )
-                $post_id = (int) $id;
+                $post_id = get_the_ID();
 
         $post_id = (int) $post_id;
@@ -1337 +1335 @@
  */
 function is_sticky($post_id = null) {
-        global $id;
+        if ( !$post_id )
+                $post_id = get_the_ID();
 
         $post_id = absint($post_id);
-
-        if ( !$post_id )
-                $post_id = absint($id);
 
         $stickies = get_option('sticky_posts');