WordPress 3.4

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

diff --git a/wp-content/themes/twentyeleven/header.php b/wp-content/themes/twentyeleven/header.php
index b1be094ad40a7c4fa5e1ab8f1e2cc54a4ec1d040..59b6d3b1402d6cf722061b9b0980b74e08c98a3a 100644 (file)
--- a/wp-content/themes/twentyeleven/header.php
+++ b/wp-content/themes/twentyeleven/header.php
@@ -78,20 +78,36 @@
                        <?php
                                // Check to see if the header image has been removed
                                $header_image = get_header_image();
-                               if ( ! empty( $header_image ) ) :
-                       ?>
+                               if ( $header_image ) :
+                                       // Compatibility with versions of WordPress prior to 3.4.
+                                       if ( function_exists( 'get_custom_header' ) ) {
+                                               // We need to figure out what the minimum width should be for our featured image.
+                                               // This result would be the suggested width if the theme were to implement flexible widths.
+                                               $header_image_width = get_theme_support( 'custom-header', 'width' );
+                                       } else {
+                                               $header_image_width = HEADER_IMAGE_WIDTH;
+                                       }
+                                       ?>
                        <a href="<?php echo esc_url( home_url( '/' ) ); ?>">
                                <?php
                                        // The header image
                                        // Check if this is a post or page, if it has a thumbnail, and if it's a big one
-                                       if ( is_singular() &&
-                                                       has_post_thumbnail( $post->ID ) &&
-                                                       ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( HEADER_IMAGE_WIDTH, HEADER_IMAGE_WIDTH ) ) ) &&
-                                                       $image[1] >= HEADER_IMAGE_WIDTH ) :
+                                       if ( is_singular() && has_post_thumbnail( $post->ID ) &&
+                                                       ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
+                                                       $image[1] >= $header_image_width ) :
                                                // Houston, we have a new header image!
                                                echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-                                       else : ?>
-                                       <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
+                                       else :
+                                               // Compatibility with versions of WordPress prior to 3.4.
+                                               if ( function_exists( 'get_custom_header' ) ) {
+                                                       $header_image_width  = get_custom_header()->width;
+                                                       $header_image_height = get_custom_header()->height;
+                                               } else {
+                                                       $header_image_width  = HEADER_IMAGE_WIDTH;
+                                                       $header_image_height = HEADER_IMAGE_HEIGHT;
+                                               }
+                                               ?>
+                                       <img src="<?php header_image(); ?>" width="<?php echo $header_image_width; ?>" height="<?php echo $header_image_height; ?>" alt="" />
                                <?php endif; // end check for featured image or standard header ?>
                        </a>
                        <?php endif; // end check for removed header image ?>
@@ -100,7 +116,7 @@
                                // Has the text been hidden?
                                if ( 'blank' == get_header_textcolor() ) :
                        ?>
-                               <div class="only-search<?php if ( ! empty( $header_image ) ) : ?> with-image<?php endif; ?>">
+                               <div class="only-search<?php if ( $header_image ) : ?> with-image<?php endif; ?>">
                                <?php get_search_form(); ?>
                                </div>
                        <?php
@@ -111,13 +127,13 @@
 
                        <nav id="access" role="navigation">
                                <h3 class="assistive-text"><?php _e( 'Main menu', 'twentyeleven' ); ?></h3>
-                               <?php /*  Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. */ ?>
+                               <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff. */ ?>
                                <div class="skip-link"><a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to primary content', 'twentyeleven' ); ?>"><?php _e( 'Skip to primary content', 'twentyeleven' ); ?></a></div>
                                <div class="skip-link"><a class="assistive-text" href="#secondary" title="<?php esc_attr_e( 'Skip to secondary content', 'twentyeleven' ); ?>"><?php _e( 'Skip to secondary content', 'twentyeleven' ); ?></a></div>
-                               <?php /* Our navigation menu.  If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
+                               <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assigned to the primary location is the one used. If one isn't assigned, the menu with the lowest ID is used. */ ?>
                                <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
                        </nav><!-- #access -->
        </header><!-- #branding -->
 
 
-       <div id="main">
\ No newline at end of file
+       <div id="main">