Changeset 15549 for trunk/wp-includes/comment-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/comment-template.php (modified) (8 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;