Changeset 22669 for trunk/wp-includes/theme.php

Timestamp:

11/19/2012 06:59:25 AM (13 years ago)

Author:

nacin

Message:

In get_custom_header(), support a default header that is registered using default-image but not register_default_headers(). fixes #22221.

File:

• trunk/wp-includes/theme.php (modified) (1 diff)

trunk/wp-includes/theme.php

@@ -1035 +1035 @@
     } else {
         $data = get_theme_mod( 'header_image_data' );
-        if ( ! $data && isset( $_wp_default_headers ) && current_theme_supports( 'custom-header', 'default-image' ) ) {
+        if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
             $directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
-            $default_image = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
-            foreach ( (array) $_wp_default_headers as $header => $details ) {
-                $url = vsprintf( $details['url'], $directory_args );
-                if ( $default_image == $url ) {
-                    $data = $details;
-                    $data['url'] = $url;
-                    $data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
-                    break;
+            $data = array();
+            $data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
+            if ( ! empty( $_wp_default_headers ) ) {
+                foreach ( (array) $_wp_default_headers as $default_header ) {
+                    $url = vsprintf( $default_header['url'], $directory_args );
+                    if ( $data['url'] == $url ) {
+                        $data = $default_header;
+                        $data['url'] = $url;
+                        $data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
+                        break;
+                    }
                 }
             }