WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/post.php

    r10253 r10150  
    216216        else
    217217            return $null;
    218     } elseif ( is_object($post) && empty($post->filter) ) {
     218    } elseif ( is_object($post) ) {
    219219        _get_post_ancestors($post);
    220220        wp_cache_add($post->ID, $post, 'posts');
    221221        $_post = &$post;
    222222    } else {
    223         if ( is_object($post) )
    224             $post = $post->ID;
    225223        $post = (int) $post;
    226224        if ( ! $_post = wp_cache_get($post, 'posts') ) {
     
    742740    $custom = get_post_custom($post_id);
    743741
    744     return isset($custom[$key]) ? $custom[$key] : null;
     742    return $custom[$key];
    745743}
    746744
     
    795793        foreach ( array_keys(get_object_vars($post)) as $field )
    796794            $post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
    797         $post->filter = $context;
    798795    } else {
    799796        if ( !isset($post['ID']) )
     
    801798        foreach ( array_keys($post) as $field )
    802799            $post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
    803         $post['filter'] = $context;
    804     }
    805 
     800    }
    806801    return $post;
    807802}
     
    25412536            if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location
    25422537                $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location
    2543             elseif ( false !== strpos($file, 'wp-content/uploads') )
    2544                 $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
    2545             else
    2546                 $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir.
    25472538        }
    25482539    }
Note: See TracChangeset for help on using the changeset viewer.