From 15b9961b520711ba335a92d1943d40df59e2539a Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 18 May 2012 20:22:57 +0000
Subject: [PATCH] set_url_scheme() for header and background image srcs. see
 #20702

git-svn-id: http://core.svn.wordpress.org/trunk@20830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/custom-background.php             | 6 +++---
 wp-admin/custom-header.php                 | 2 +-
 wp-includes/class-wp-customize-control.php | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wp-admin/custom-background.php b/wp-admin/custom-background.php
index 4e3cbc0ba..c2b05c081 100644
--- a/wp-admin/custom-background.php
+++ b/wp-admin/custom-background.php
@@ -207,15 +207,15 @@ if ( $bgcolor = get_background_color() )
 
 if ( get_background_image() ) {
 	// background-image URL must be single quote, see below
-	$background_styles .= ' background-image: url(\'' . get_theme_mod('background_image_thumb', '') . '\');'
+	$background_styles .= ' background-image: url(\'' . set_url_scheme( get_theme_mod('background_image_thumb', '') ) . '\');'
 		. ' background-repeat: ' . get_theme_mod('background_repeat', 'repeat') . ';'
 		. ' background-position: top ' . get_theme_mod('background_position_x', 'left');
 }
 ?>
 <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
 <?php if ( get_background_image() ) { ?>
-<img class="custom-background-image" src="<?php echo get_theme_mod('background_image_thumb', ''); ?>" style="visibility:hidden;" alt="" /><br />
-<img class="custom-background-image" src="<?php echo get_theme_mod('background_image_thumb', ''); ?>" style="visibility:hidden;" alt="" />
+<img class="custom-background-image" src="<?php echo set_url_scheme( get_theme_mod('background_image_thumb', '') ); ?>" style="visibility:hidden;" alt="" /><br />
+<img class="custom-background-image" src="<?php echo set_url_scheme( get_theme_mod('background_image_thumb', '') ); ?>" style="visibility:hidden;" alt="" />
 <?php } ?>
 </div>
 <?php } ?>
diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php
index 862d1023a..ca047b8d9 100644
--- a/wp-admin/custom-header.php
+++ b/wp-admin/custom-header.php
@@ -333,7 +333,7 @@ class Custom_Image_Header {
 			$width = '';
 			if ( !empty( $header['attachment_id'] ) )
 				$width = ' width="230"';
-			echo '<img src="' . $header_thumbnail . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
+			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_desc ) .'" title="' . esc_attr( $header_desc ) . '"' . $width . ' /></label>';
 			echo '</div>';
 		}
 		echo '<div class="clear"></div></div>';
diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index e9d0caddb..1c96ee046 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -343,7 +343,7 @@ class WP_Customize_Image_Control extends WP_Customize_Upload_Control {
 						<?php if ( empty( $src ) ): ?>
 							<img style="display:none;" />
 						<?php else: ?>
-							<img src="<?php echo esc_url( $src ); ?>" />
+							<img src="<?php echo esc_url( set_url_scheme( $src ) ); ?>" />
 						<?php endif; ?>
 						<div class="dropdown-status"></div>
 					</div>
@@ -426,7 +426,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 
 		foreach ( $headers as $header ) : ?>
 			<a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $header['url'] ); ?>">
-				<img src="<?php echo esc_url( $header['thumbnail_url'] ); ?>" />
+				<img src="<?php echo esc_url( set_url_scheme( $header['thumbnail_url'] ) ); ?>" />
 			</a>
 		<?php endforeach;
 	}
@@ -437,7 +437,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
 
 		foreach ( $custom_image_header->default_headers as $header ) : ?>
 			<a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $header['url'] ); ?>">
-				<img src="<?php echo esc_url( $header['thumbnail_url'] ); ?>" />
+				<img src="<?php echo esc_url( set_url_scheme( $header['thumbnail_url'] ) ); ?>" />
 			</a>
 		<?php endforeach;
 	}