<!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>[21013] trunk/wp-includes: Don't resurrect a removed default image when changing colors in 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/21013">21013</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-06-06 21:24:22 +0000 (Wed, 06 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't resurrect a removed default image when changing colors in the Customizer. Props koopersmith, nacin. fixes <a href="http://core.trac.wordpress.org/ticket/20448">#20448</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpcustomizemanagerphp">trunk/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunkwpincludesjscustomizepreviewdevjs">trunk/wp-includes/js/customize-preview.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-customize-manager.php (21012 => 21013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-customize-manager.php 2012-06-06 21:15:43 UTC (rev 21012)
+++ trunk/wp-includes/class-wp-customize-manager.php 2012-06-06 21:24:22 UTC (rev 21013)
</span><span class="lines">@@ -312,6 +312,7 @@
</span><span class="cx"> $settings = array(
</span><span class="cx"> 'values' => array(),
</span><span class="cx"> 'channel' => esc_js( $_POST['customize_messenger_channel'] ),
</span><ins>+ 'backgroundImageHasDefault' => current_theme_supports( 'custom-background', 'default-image' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach ( $this->settings as $id => $setting ) {
</span></span></pre></div>
<a id="trunkwpincludesjscustomizepreviewdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/customize-preview.dev.js (21012 => 21013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/customize-preview.dev.js 2012-06-06 21:15:43 UTC (rev 21012)
+++ trunk/wp-includes/js/customize-preview.dev.js 2012-06-06 21:24:22 UTC (rev 21013)
</span><span class="lines">@@ -109,13 +109,14 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> update = function() {
</span><del>- var css = '';
</del><ins>+ var css = '',
+ hasDefault = api.settings.backgroundImageHasDefault;
</ins><span class="cx">
</span><span class="cx"> // The body will support custom backgrounds if either
</span><span class="cx"> // the color or image are set.
</span><span class="cx"> //
</span><span class="cx"> // See get_body_class() in /wp-includes/post-template.php
</span><del>- body.toggleClass( 'custom-background', !! ( color() || image() ) );
</del><ins>+ body.toggleClass( 'custom-background', !! ( color() || image() || hasDefault ) );
</ins><span class="cx">
</span><span class="cx"> if ( color() )
</span><span class="cx"> css += 'background-color: ' + color() + ';';
</span><span class="lines">@@ -125,6 +126,8 @@
</span><span class="cx"> css += 'background-position: top ' + position_x() + ';';
</span><span class="cx"> css += 'background-repeat: ' + repeat() + ';';
</span><span class="cx"> css += 'background-position: top ' + attachment() + ';';
</span><ins>+ } else if ( hasDefault ) {
+ css += 'background-image: none;';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Refresh the stylesheet by removing and recreating it.
</span></span></pre>
</div>
</div>
</body>
</html>