WordPress.org

Make WordPress Core

Changeset 15549


Ignore:
Timestamp:
08/28/2010 11:57:28 AM (9 years ago)
Author:
scribu
Message:

Don't use the global anymore. Fixes #11624

Location:
trunk/wp-includes
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/comment-template.php

    r15433 r15549  
    546546 */
    547547function get_comments_number( $post_id = 0 ) {
    548     global $id;
    549     $post_id = (int) $post_id;
    550 
    551548    if ( !$post_id )
    552         $post_id = (int) $id;
     549        $post_id = get_the_ID();
     550
     551    $post_id = absint($post_id);
    553552
    554553    $post = get_post($post_id);
     
    565564 *
    566565 * @since 0.71
    567  * @uses $id
    568566 * @uses apply_filters() Calls the 'comments_number' hook on the output and number of comments respectively.
    569567 *
     
    574572 */
    575573function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
    576     global $id;
    577 
    578574    if ( !empty( $deprecated ) )
    579575        _deprecated_argument( __FUNCTION__, '1.3' );
    580576
    581     $number = get_comments_number($id);
     577    $number = get_comments_number(get_the_ID());
    582578
    583579    if ( $number > 1 )
     
    704700 * @since 1.5.0
    705701 * @uses apply_filters() Calls 'trackback_url' on the resulting trackback URL
    706  * @uses $id
    707702 *
    708703 * @return string The trackback URL after being filtered
    709704 */
    710705function get_trackback_url() {
    711     global $id;
    712706    if ( '' != get_option('permalink_structure') ) {
    713707        $tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
    714708    } else {
    715         $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
     709        $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
    716710    }
    717711    return apply_filters('trackback_url', $tb_url);
     
    845839 * @global array $comment List of comment objects for the current post
    846840 * @uses $wpdb
    847  * @uses $id
    848841 * @uses $post
    849842 * @uses $withcomments Will not try to get the comments if the post has none.
     
    962955 *
    963956 * @since 0.71
    964  * @uses $id
    965957 * @uses $wpcommentspopupfile
    966958 * @uses $wpcommentsjavascript
     
    975967 */
    976968function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
    977     global $id, $wpcommentspopupfile, $wpcommentsjavascript;
     969    global $wpcommentspopupfile, $wpcommentsjavascript;
     970
     971    $id = get_the_ID();
    978972
    979973    if ( false === $zero ) $zero = __( 'No Comments' );
     
    11691163 */
    11701164function get_comment_id_fields() {
    1171     global $id;
     1165    $id = get_the_ID();
    11721166
    11731167    $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
  • trunk/wp-includes/link-template.php

    r15481 r15549  
    463463 */
    464464function get_post_comments_feed_link($post_id = '', $feed = '') {
    465     global $id;
    466 
    467     if ( empty($post_id) )
    468         $post_id = (int) $id;
     465    if ( !$post_id )
     466        $post_id = get_the_ID();
     467
     468    $post_id = absint($post_id);
    469469
    470470    if ( empty($feed) )
  • trunk/wp-includes/post-template.php

    r15264 r15549  
    1313 *
    1414 * @since 0.71
    15  * @uses $id
    1615 */
    1716function the_ID() {
    18     global $id;
    19     echo $id;
     17    echo get_the_ID();
    2018}
    2119
     
    2422 *
    2523 * @since 2.1.0
    26  * @uses $id
    27  *
    28  * @return unknown
     24 * @uses $post
     25 *
     26 * @return int
    2927 */
    3028function get_the_ID() {
    31     global $id;
    32     return $id;
     29    global $post;
     30    return $post->ID;
    3331}
    3432
     
    182180 */
    183181function get_the_content($more_link_text = null, $stripteaser = 0) {
    184     global $id, $post, $more, $page, $pages, $multipage, $preview;
     182    global $post, $more, $page, $pages, $multipage, $preview;
    185183
    186184    if ( null === $more_link_text )
     
    217215    if ( count($content) > 1 ) {
    218216        if ( $more ) {
    219             $output .= '<span id="more-' . $id . '"></span>' . $content[1];
     217            $output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
    220218        } else {
    221219            if ( ! empty($more_link_text) )
    222                 $output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-$id\" class=\"more-link\">$more_link_text</a>", $more_link_text );
     220                $output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
    223221            $output = force_balance_tags($output);
    224222        }
  • trunk/wp-includes/post-thumbnail-template.php

    r15355 r15549  
    1919 */
    2020function has_post_thumbnail( $post_id = NULL ) {
    21     global $id;
    22     $post_id = ( NULL === $post_id ) ? $id : $post_id;
     21    $post_id = ( NULL === $post_id ) ? get_the_ID() : $post_id;
    2322    return !! get_post_thumbnail_id( $post_id );
    2423}
     
    3332 */
    3433function get_post_thumbnail_id( $post_id = NULL ) {
    35     global $id;
    36     $post_id = ( NULL === $post_id ) ? $id : $post_id;
     34    $post_id = ( NULL === $post_id ) ? get_the_ID() : $post_id;
    3735    return get_post_meta( $post_id, '_thumbnail_id', true );
    3836}
     
    6058 */
    6159function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) {
    62     global $id;
    63     $post_id = ( NULL === $post_id ) ? $id : $post_id;
     60    $post_id = ( NULL === $post_id ) ? get_the_ID() : $post_id;
    6461    $post_thumbnail_id = get_post_thumbnail_id( $post_id );
    6562    $size = apply_filters( 'post_thumbnail_size', $size );
  • trunk/wp-includes/post.php

    r15548 r15549  
    12691269 */
    12701270function get_post_custom($post_id = 0) {
    1271     global $id;
    1272 
    12731271    if ( !$post_id )
    1274         $post_id = (int) $id;
     1272        $post_id = get_the_ID();
    12751273
    12761274    $post_id = (int) $post_id;
     
    13371335 */
    13381336function is_sticky($post_id = null) {
    1339     global $id;
     1337    if ( !$post_id )
     1338        $post_id = get_the_ID();
    13401339
    13411340    $post_id = absint($post_id);
    1342 
    1343     if ( !$post_id )
    1344         $post_id = absint($id);
    13451341
    13461342    $stickies = get_option('sticky_posts');
Note: See TracChangeset for help on using the changeset viewer.