Permalink
Browse files

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@20474 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
nacin
nacin committed Apr 15, 2012
1 parent 0393394 commit fa631702a6ef8f2cc81aaead7d93facbb7c715d0
Showing with 11 additions and 2 deletions.
  1. +2 −0 wp-content/themes/twentyten/functions.php
  2. +9 −2 wp-content/themes/twentyten/header.php
@@ -105,6 +105,8 @@ function twentyten_setup() {
// The height and width of our custom header.
'width' => apply_filters( 'twentyten_header_image_width', 940 ),
'height' => apply_filters( 'twentyten_header_image_height', 198 ),
+ // Support flexible heights.
+ 'flex-height' => true,
// Don't support text inside the header image.
'header-text' => false,
// Callback for styling the header preview in the admin.
@@ -73,8 +73,15 @@
$image[1] >= get_theme_support( 'custom-header', 'width' ) ) :
// Houston, we have a new header image!
echo get_the_post_thumbnail( $post->ID );
- elseif ( get_header_image() ) : ?>
- <img src="<?php header_image(); ?>" width="<?php echo get_theme_support( 'custom-header', 'width' ); ?>" height="<?php echo get_theme_support( 'custom-header', 'height' ); ?>" alt="" />
+ elseif ( get_header_image() ) :
+ if ( function_exists( 'get_custom_header' ) ) {
+ $header_width = get_custom_header()->width;
+ $header_height = get_custom_header()->height;
+ } else {
+ $header_height = $header_width = '';
+ }
+ ?>
+ <img src="<?php header_image(); ?>" width="<?php echo $header_width; ?>" height="<?php echo $header_height; ?>" alt="" />
<?php endif; ?>
</div><!-- #branding -->

0 comments on commit fa63170

Please sign in to comment.