Ticket #38557: 38557.diff

src/wp-admin/custom-header.php

@@ -246 +246 @@
                 }
 
                 $this->default_headers = $_wp_default_headers;
-                $template_directory_uri = get_template_directory_uri();
-                $stylesheet_directory_uri = get_stylesheet_directory_uri();
-                foreach ( array_keys($this->default_headers) as $header ) {
-                        $this->default_headers[$header]['url'] =  sprintf( $this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri );
-                        $this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
-                }
         }
 
         /**
@@ -1080 +1074 @@
                         $this->remove_header_image();
                         return;
                 }
-                $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
 
                 $default_data = array();
                 foreach ( $this->default_headers as $header => $details ) {
@@ -1333 +1326 @@
                         return $this->default_headers; // easy peasy.
                 }
 
-                $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
                 $already_has_default = false;
 
                 foreach ( $this->default_headers as $k => $h ) {

src/wp-includes/class-wp-customize-manager.php

@@ -3435 +3435 @@
                 ) );
 
                 $this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
-                        'default'        => get_theme_support( 'custom-header', 'default-image' ),
+                        'default'        => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
                         'theme_supports' => 'custom-header',
                 ) ) );
 

src/wp-includes/theme.php

@@ -1128 +1128 @@
                         return new stdClass;
 
                 $_wp_random_header = (object) $headers[ array_rand( $headers ) ];
-
-                $_wp_random_header->url =  sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
-                $_wp_random_header->thumbnail_url =  sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
         }
         return $_wp_random_header;
 }
@@ -1242 +1239 @@
         } else {
                 $data = get_theme_mod( 'header_image_data' );
                 if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
-                        $directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
                         $data = array();
-                        $data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
+                        $data['url'] = $data['thumbnail_url'] = get_theme_support( 'custom-header', 'default-image' );
                         if ( ! empty( $_wp_default_headers ) ) {
                                 foreach ( (array) $_wp_default_headers as $default_header ) {
-                                        $url = vsprintf( $default_header['url'], $directory_args );
-                                        if ( $data['url'] == $url ) {
+                                        if ( $data['url'] == $default_header['url'] ) {
                                                 $data = $default_header;
-                                                $data['url'] = $url;
-                                                $data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
                                                 break;
                                         }
                                 }
@@ -1281 +1274 @@
 function register_default_headers( $headers ) {
         global $_wp_default_headers;
 
+        $directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
+
+        foreach ( (array) $headers as $key => $header ) {
+                if ( isset( $header['url'] ) ) {
+                        $headers[ $key ]['url'] = vsprintf( $header['url'], $directory_args );
+                }
+
+                if ( isset( $header['thumbnail_url'] ) ) {
+                        $headers[ $key ]['thumbnail_url'] = vsprintf( $header['thumbnail_url'], $directory_args );
+                }
+        }
+
         $_wp_default_headers = array_merge( (array) $_wp_default_headers, (array) $headers );
 }
 
@@ -2094 +2099 @@
                                         $args[0]['flex-height'] = true;
                         }
 
+                        $args[0]['default-image'] = sprintf( $args[0]['default-image'], get_template_directory_uri(), get_stylesheet_directory_uri() );
+
                         break;
 
                 case 'custom-background' :