Changeset 21508

Timestamp:

08/14/2012 07:24:36 PM (12 years ago)

Author:

ryan

Message:

Fix display issues in the custom header screen when height is not specified. Use get_header_image() instead of header_image() so that esc_url() can do its job. Props JarretC, SergeyBiryukov, georgestephanis. fixes #21130 #21433

Location:

trunk/wp-admin

Files:

• css/wp-admin.dev.css (modified) (1 diff)
• custom-header.php (modified) (1 diff)

trunk/wp-admin/css/wp-admin.dev.css

@@ -4609 +4609 @@
 .appearance_page_custom-header #headimg {
     border: 1px solid #DFDFDF;
+    overflow: hidden;
     width: 100%;
 }

trunk/wp-admin/custom-header.php

@@ -511 +511 @@
       call_user_func( $this->admin_image_div_callback );
     } else {
+        $custom_header = get_custom_header();
+        $header_image_style = 'background-image:url(' . esc_url( get_header_image() ) . ');';
+        if ( $custom_header->width )
+            $header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+        if ( $custom_header->height )
+            $header_image_style .= 'height:' . $custom_header->height . 'px;';
     ?>
-    <div id="headimg" style="background-image:url(<?php esc_url ( header_image() ) ?>);max-width:<?php echo get_custom_header()->width; ?>px;height:<?php echo get_custom_header()->height; ?>px;">
+    <div id="headimg" style="<?php echo $header_image_style; ?>">
         <?php
         if ( display_header_text() )