Wordpress 3.1

[autoinstalls/wordpress.git] / wp-content / themes / twentyten / header.php

diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index fa4b72791629f1156a2b2ba41cef7604c782535b..54971c930f5370c964d8378baf34c53f5bbfde32 100644 (file)
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -67,13 +67,13 @@
 
                                <?php
                                        // Check if this is a post or page, if it has a thumbnail, and if it's a big one
-                                       if ( is_singular() &&
+                                       if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
                                                        has_post_thumbnail( $post->ID ) &&
                                                        ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
                                                        $image[1] >= HEADER_IMAGE_WIDTH ) :
                                                // Houston, we have a new header image!
-                                               echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-                                       else : ?>
+                                               echo get_the_post_thumbnail( $post->ID );
+                                       elseif ( get_header_image() ) : ?>
                                                <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
                                        <?php endif; ?>
                        </div><!-- #branding -->