Ticket #20768: 20768.diff

wp-content/themes/twentyeleven/functions.php

@@ -104 +104 @@
         add_theme_support( 'post-thumbnails' );
 
         // Add support for custom headers.
-        add_theme_support( 'custom-header', array(
+        $custom_header_args = array(
                 // The default header text color.
                 'default-text-color' => '000',
                 // The height and width of our custom header.
@@ -120 +120 @@
                 'admin-head-callback' => 'twentyeleven_admin_header_style',
                 // Callback used to display the header preview in the admin.
                 'admin-preview-callback' => 'twentyeleven_admin_header_image',
-        ) );
+        );
+        
+        add_theme_support( 'custom-header', $custom_header_args );
+        
+        if ( ! function_exists( 'wp_get_theme' ) ) {
+                // Compat: Versions of WordPress prior to 3.4.
+                define( 'HEADER_TEXTCOLOR', $custom_header_args['default-text-color'] );
+                define( 'HEADER_IMAGE', '' );
+                define( 'HEADER_IMAGE_WIDTH', $custom_header_args['width'] );
+                define( 'HEADER_IMAGE_HEIGHT', $custom_header_args['height'] );
+                add_custom_image_header( $custom_header_args['wp-head-callback'], $custom_header_args['admin-head-callback'], $custom_header_args['admin-preview-callback'] );
+        }
 
         // We'll be using post thumbnails for custom header images on posts and pages.
         // We want them to be the size of the header image that we just defined
@@ -303 +314 @@
 <?php }
 endif; // twentyeleven_admin_header_image
 
+if ( ! function_exists( 'get_custom_header' ) ) :
+/**
+ * Get the header image data.
+ * 
+ * Provides backward compatibility for WordPress versions prior to 3.4
+ *
+ * @since       Twenty Eleven 1.3
+ *
+ * @return      object
+*/
+function get_custom_header() {
+        return (object) array(
+                'url'           => get_header_image(),
+                'thumbnail_url' => get_header_image(),
+                'width'         => HEADER_IMAGE_WIDTH,
+                'height'        => HEADER_IMAGE_HEIGHT,
+        );
+}
+endif;
+
 /**
  * Sets the post excerpt length to 40 words.
  *

wp-content/themes/twentyten/functions.php

@@ -98 +98 @@
 
         // The custom header business starts here.
 
-        add_theme_support( 'custom-header', array(
+        $custom_header_args = array(
                 // The default image to use.
                 // The %s is a placeholder for the theme template directory URI.
                 'default-image' => '%s/images/headers/path.jpg',
@@ -111 +111 @@
                 'header-text' => false,
                 // Callback for styling the header preview in the admin.
                 'admin-head-callback' => 'twentyten_admin_header_style',
-        ) );
+        );
+        
+        add_theme_support( 'custom-header', $custom_header_args );
+        
+        if ( ! function_exists( 'wp_get_theme' ) ) {
+                // Compat: Versions of WordPress prior to 3.4.
+                define( 'HEADER_TEXTCOLOR', '' );
+                define( 'NO_HEADER_TEXT', true );
+                define( 'HEADER_IMAGE', $custom_header_args['default-image'] );
+                define( 'HEADER_IMAGE_WIDTH', $custom_header_args['width'] );
+                define( 'HEADER_IMAGE_HEIGHT', $custom_header_args['height'] );
+                add_custom_image_header( '', $custom_header_args['admin-head-callback'] );
+        }
 
         // We'll be using post thumbnails for custom header images on posts and pages.
         // We want them to be 940 pixels wide by 198 pixels tall.
@@ -199 +211 @@
 }
 endif;
 
+if ( ! function_exists( 'get_custom_header' ) ) :
+/**
+ * Get the header image data.
+*
+* Provides backward compatibility for WordPress versions prior to 3.4
+*
+* @since        Twenty Ten 1.3
+*
+* @return       object
+*/
+function get_custom_header() {
+        return (object) array(
+                'url'           => get_header_image(),
+                'thumbnail_url' => get_header_image(),
+                'width'         => HEADER_IMAGE_WIDTH,
+                'height'        => HEADER_IMAGE_HEIGHT,
+        );
+}
+endif;
+
 /**
  * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
  *

wp-content/themes/twentyten/header.php

@@ -73 +73 @@
                                                         $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() ) : 
-                                                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="" />
+                                        elseif ( get_header_image() ) : ?>
+                                                <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" />
                                         <?php endif; ?>
                         </div><!-- #branding -->