WordPress 3.3.2-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 547d4e170730d61ff17c50ea543a935e5492b9de..65a517266a119cbb6298b822efd1af4b8ab95e40 100644 (file)
--- a/wp-includes/post-thumbnail-template.php
+++ b/wp-includes/post-thumbnail-template.php
@@ -17,10 +17,8 @@
  * @param int $post_id Optional. Post ID.
  * @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 ) {
+       return (bool) get_post_thumbnail_id( $post_id );
 }
 
 /**
@@ -31,9 +29,8 @@ function has_post_thumbnail( $post_id = NULL ) {
  * @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 );
 }
 
@@ -46,7 +43,37 @@ function get_post_thumbnail_id( $post_id = NULL ) {
  * @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 );
+}
+
+/**
+ * Update cache for thumbnails in the current loop
+ *
+ * @since 3.2
+ */
+function update_post_thumbnail_cache() {
+       global $wp_query;
+
+       if ( $wp_query->thumbnails_cached )
+               return;
+
+       $thumb_ids = array();
+       foreach ( $wp_query->posts as $post ) {
+               if ( $id = get_post_thumbnail_id( $post->ID ) )
+                       $thumb_ids[] = $id;
+       }
+
+       if ( ! empty ( $thumb_ids ) ) {
+               get_posts( array(
+                               'update_post_term_cache' => false,
+                               'include' => $thumb_ids,
+                               'post_type' => 'attachment',
+                               'post_status' => 'inherit',
+                               'nopaging' => true
+               ) );
+       }
+
+       $wp_query->thumbnails_cached = true;
 }
 
 /**
@@ -57,14 +84,15 @@ function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
  * @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 ) {
                do_action( 'begin_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size ); // for "Just In Time" filtering of all of wp_get_attachment_image()'s filters
+               if ( in_the_loop() )
+                       update_post_thumbnail_cache();
                $html = wp_get_attachment_image( $post_thumbnail_id, $size, false, $attr );
                do_action( 'end_fetch_post_thumbnail_html', $post_id, $post_thumbnail_id, $size );
        } else {
@@ -73,4 +101,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
+?>