Changeset 39123

Timestamp:

11/03/2016 07:01:16 PM (8 years ago)

Author:

joemcgill

Message:

Themes: Improve support for placeholders in default headers.

When themes register default headers, they can use sprintf style placeholder
strings in place of the template directory URI, which WordPress transforms
in several places by running the value of
get_theme_support( 'custom-header', 'default-image' ) through sprintf().

This fixes a few places where WordPress skipped the sprintf() step and
referenced the get_theme_support() value directly.

Props bradyvercher for initial patch.
See #38557.

Location:

trunk/src

Files:

• wp-admin/custom-header.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (1 diff)

trunk/src/wp-admin/custom-header.php

@@ -640 +640 @@
     <?php endif;
 
-    $default_image = get_theme_support( 'custom-header', 'default-image' );
+    $default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
     if ( $default_image && get_header_image() != $default_image ) : ?>
 <tr>

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

@@ -3440 +3440 @@
 
         $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',
         ) ) );
 
         $this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
-            // 'default'        => get_theme_support( 'custom-header', 'default-image' ),
             'theme_supports' => 'custom-header',
         ) ) );