Changeset 20470

Timestamp:

04/15/2012 07:53:10 PM (12 years ago)

Author:

nacin

Message:

Flexible heights for Twenty Eleven's custom headers. see #20448.

Location:

trunk/wp-content/themes/twentyeleven

Files:

• functions.php (modified) (1 diff)
• header.php (modified) (3 diffs)

trunk/wp-content/themes/twentyeleven/functions.php

@@ -116 +116 @@
         'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
         'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
+        // Support flexible heights.
+        'flex-height' => true,
         // Random image rotation by default.
         'random-default' => true,

trunk/wp-content/themes/twentyeleven/header.php

@@ -80 +80 @@
                 $header_image = get_header_image();
                 if ( $header_image ) :
-                    $header_image_width  = get_theme_support( 'custom-header', 'width' );
-                    $header_image_height = get_theme_support( 'custom-header', 'height' );
+                    $header_image_width  = get_custom_header()->width;
             ?>
             <a href="<?php echo esc_url( home_url( '/' ) ); ?>">
@@ -87 +86 @@
                     // 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 ) &&
+                    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 ) :
@@ -94 +92 @@
                         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="" />
+                    <img src="<?php header_image(); ?>" width="<?php echo $header_image_width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" />
                 <?php endif; // end check for featured image or standard header ?>
             </a>