<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20913] trunk: Theme Customizer: Improve background image control, add correct meta key to custom headers and backgrounds uploaded using the customizer.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20913">20913</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-05-25 20:26:25 +0000 (Fri, 25 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Customizer: Improve background image control, add correct meta key to custom headers and backgrounds uploaded using the customizer. see <a href="http://core.trac.wordpress.org/ticket/19910">#19910</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesajaxactionsphp">trunk/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunkwpincludesclasswpcustomizecontrolphp">trunk/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunkwpincludesclasswpcustomizemanagerphp">trunk/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunkwpincludesjscustomizecontrolsdevjs">trunk/wp-includes/js/customize-controls.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ajax-actions.php (20912 => 20913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ajax-actions.php 2012-05-25 19:52:54 UTC (rev 20912)
+++ trunk/wp-admin/includes/ajax-actions.php 2012-05-25 20:26:25 UTC (rev 20913)
</span><span class="lines">@@ -1640,6 +1640,14 @@
</span><span class="cx"> wp_die();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
+ if ( 'custom-background' === $post_data['context'] )
+ update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] );
+
+ if ( 'custom-header' === $post_data['context'] )
+ update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] );
+ }
+
</ins><span class="cx"> $post = get_post( $attachment_id );
</span><span class="cx">
</span><span class="cx"> echo json_encode( array(
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizecontrolphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-control.php (20912 => 20913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-control.php 2012-05-25 19:52:54 UTC (rev 20912)
+++ trunk/wp-includes/class-wp-customize-control.php 2012-05-25 20:26:25 UTC (rev 20913)
</span><span class="lines">@@ -398,8 +398,54 @@
</span><span class="cx"> <div class="uploaded-target"></div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><ins>+
+ public function print_tab_image( $url, $thumbnail_url = null ) {
+ $url = set_url_scheme( $url );
+ $thumbnail_url = ( $thumbnail_url ) ? set_url_scheme( $thumbnail_url ) : $url;
+ ?>
+ <a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $url ); ?>">
+ <img src="<?php echo esc_url( $thumbnail_url ); ?>" />
+ </a>
+ <?php
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+class WP_Customize_Background_Image_Control extends WP_Customize_Image_Control {
+ public function __construct( $manager ) {
+ parent::__construct( $manager, 'background_image', array(
+ 'label' => __( 'Background Image' ),
+ 'section' => 'background_image',
+ 'context' => 'custom-background',
+ 'get_url' => 'get_background_image',
+ ) );
+
+ if ( $this->setting->default )
+ $this->add_tab( 'default', __('Default'), array( $this, 'tab_default_background' ) );
+ }
+
+ public function tab_uploaded() {
+ $backgrounds = get_posts( array(
+ 'post_type' => 'attachment',
+ 'meta_key' => '_wp_attachment_is_custom_background',
+ 'meta_value' => $this->manager->get_stylesheet(),
+ 'orderby' => 'none',
+ 'nopaging' => true,
+ ) );
+
+ ?><div class="uploaded-target"></div><?php
+
+ if ( empty( $backgrounds ) )
+ return;
+
+ foreach ( (array) $backgrounds as $background )
+ $this->print_tab_image( esc_url_raw( $background->guid ) );
+ }
+
+ public function tab_default_background() {
+ $this->print_tab_image( $this->setting->default );
+ }
+}
+
</ins><span class="cx"> class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
</span><span class="cx"> public function __construct( $manager ) {
</span><span class="cx"> parent::__construct( $manager, 'header_image', array(
</span><span class="lines">@@ -424,21 +470,15 @@
</span><span class="cx">
</span><span class="cx"> ?><div class="uploaded-target"></div><?php
</span><span class="cx">
</span><del>- foreach ( $headers as $header ) : ?>
- <a href="#" class="thumbnail" data-customize-image-value="<?php echo esc_url( $header['url'] ); ?>">
- <img src="<?php echo esc_url( set_url_scheme( $header['thumbnail_url'] ) ); ?>" />
- </a>
- <?php endforeach;
</del><ins>+ foreach ( $headers as $header )
+ $this->print_tab_image( $header['url'], $header['thumbnail_url'] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function tab_default_headers() {
</span><span class="cx"> global $custom_image_header;
</span><span class="cx"> $custom_image_header->process_default_headers();
</span><span class="cx">
</span><del>- 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( set_url_scheme( $header['thumbnail_url'] ) ); ?>" />
- </a>
- <?php endforeach;
</del><ins>+ foreach ( $custom_image_header->default_headers as $header )
+ $this->print_tab_image( $header['url'], $header['thumbnail_url'] );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-manager.php (20912 => 20913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-manager.php 2012-05-25 19:52:54 UTC (rev 20912)
+++ trunk/wp-includes/class-wp-customize-manager.php 2012-05-25 20:26:25 UTC (rev 20913)
</span><span class="lines">@@ -698,11 +698,7 @@
</span><span class="cx"> 'theme_supports' => 'custom-background',
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- $this->add_control( new WP_Customize_Image_Control( $this, 'background_image', array(
- 'label' => __( 'Background Image' ),
- 'section' => 'background_image',
- 'context' => 'custom-background',
- ) ) );
</del><ins>+ $this->add_control( new WP_Customize_Background_Image_Control( $this ) );
</ins><span class="cx">
</span><span class="cx"> $this->add_setting( 'background_repeat', array(
</span><span class="cx"> 'default' => 'repeat',
</span></span></pre></div>
<a id="trunkwpincludesjscustomizecontrolsdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-controls.dev.js (20912 => 20913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-controls.dev.js 2012-05-25 19:52:54 UTC (rev 20912)
+++ trunk/wp-includes/js/customize-controls.dev.js 2012-05-25 20:26:25 UTC (rev 20913)
</span><span class="lines">@@ -158,6 +158,8 @@
</span><span class="cx">
</span><span class="cx"> if ( this.params.context )
</span><span class="cx"> control.uploader.param( 'post_data[context]', this.params.context );
</span><ins>+
+ control.uploader.param( 'post_data[theme]', api.settings.theme.stylesheet );
</ins><span class="cx"> },
</span><span class="cx"> success: function( attachment ) {
</span><span class="cx"> this.setting.set( attachment.url );
</span></span></pre>
</div>
</div>
</body>
</html>