Wordpress 3.1-scripts

[autoinstalls/wordpress.git] / wp-includes / post-thumbnail-template.php

diff --git a/wp-includes/post-thumbnail-template.php b/wp-includes/post-thumbnail-template.php
index 5f59040537d7d3a28ec044dc5499f88d204b9dfa..3758d1d471a8512d42644468732a71b10fd96666 100644 (file)
--- a/wp-includes/post-thumbnail-template.php
+++ b/wp-includes/post-thumbnail-template.php
@@ -11,56 +11,53 @@
 
 /**
  * Check if post has an image attached.
- * 
+ *
  * @since 2.9.0
  *
  * @param int $post_id Optional. Post ID.
- * @return bool Whether post has an image attached (true) or not (false).
+ * @return bool Whether post has an image attached.
  */
-function has_post_thumbnail( $post_id = NULL ) {
-       global $id;
-       $post_id = ( NULL === $post_id ) ? $id : $post_id;
-       return !! get_post_thumbnail_id( $post_id );
+function has_post_thumbnail( $post_id = null ) {
+       $post_id = ( null === $post_id ) ? get_the_ID() : $post_id;
+       return (bool) get_post_thumbnail_id( $post_id );
 }
 
 /**
  * Retrieve Post Thumbnail ID.
- * 
+ *
  * @since 2.9.0
  *
  * @param int $post_id Optional. Post ID.
  * @return int
  */
-function get_post_thumbnail_id( $post_id = NULL ) {
-       global $id;
-       $post_id = ( NULL === $post_id ) ? $id : $post_id;
+function get_post_thumbnail_id( $post_id = null ) {
+       $post_id = ( null === $post_id ) ? get_the_ID() : $post_id;
        return get_post_meta( $post_id, '_thumbnail_id', true );
 }
 
 /**
  * Display Post Thumbnail.
- * 
+ *
  * @since 2.9.0
  *
  * @param int $size Optional. Image size.  Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );.
  * @param string|array $attr Optional. Query string or array of attributes.
  */
 function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
-       echo get_the_post_thumbnail( NULL, $size, $attr );
+       echo get_the_post_thumbnail( null, $size, $attr );
 }
 
 /**
  * Retrieve Post Thumbnail.
- * 
+ *
  * @since 2.9.0
  *
  * @param int $post_id Optional. Post ID.
  * @param string $size Optional. Image size.  Defaults to 'thumbnail'.
  * @param string|array $attr Optional. Query string or array of attributes.
-  */
-function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) {
-       global $id;
-       $post_id = ( NULL === $post_id ) ? $id : $post_id;
+ */
+function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $attr = '' ) {
+       $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 );
        if ( $post_thumbnail_id ) {
@@ -73,4 +70,4 @@ function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $att
        return apply_filters( 'post_thumbnail_html', $html, $post_id, $post_thumbnail_id, $size, $attr );
 }
 
-?>
\ No newline at end of file
+?>