<!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>[20973] trunk: Custom background fixes:</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/20973">20973</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-06-01 20:31:50 +0000 (Fri, 01 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Custom background fixes:
* Specify default background colors for the bundled themes.
* Change the default custom background callback to only operate on saved values, rather than default values.
* Prevent an unsaved default value from overriding a manually modified style.css file.
Props nacin, kobenland
fixes <a href="http://core.trac.wordpress.org/ticket/20448">#20448</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (20972 => 20973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2012-06-01 19:05:30 UTC (rev 20972)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2012-06-01 20:31:50 UTC (rev 20973)
</span><span class="lines">@@ -97,8 +97,18 @@
</span><span class="cx"> // Add support for a variety of post formats
</span><span class="cx"> add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
</span><span class="cx">
</span><ins>+ $theme_options = twentyeleven_get_theme_options();
+ if ( 'dark' == $theme_options['color_scheme'] )
+ $default_background_color = '1d1d1d';
+ else
+ $default_background_color = 'f1f1f1';
+
</ins><span class="cx"> // Add support for custom backgrounds.
</span><del>- add_theme_support( 'custom-background' );
</del><ins>+ add_theme_support( 'custom-background', array(
+ // Let WordPress know what our default background color is.
+ // This is dependent on our current color scheme.
+ 'default-color' => $default_background_color,
+ ) );
</ins><span class="cx">
</span><span class="cx"> // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
</span><span class="cx"> add_theme_support( 'post-thumbnails' );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (20972 => 20973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2012-06-01 19:05:30 UTC (rev 20972)
+++ trunk/wp-content/themes/twentyten/functions.php 2012-06-01 20:31:50 UTC (rev 20973)
</span><span class="lines">@@ -94,7 +94,10 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // This theme allows users to set a custom background.
</span><del>- add_theme_support( 'custom-background' );
</del><ins>+ add_theme_support( 'custom-background', array(
+ // Let WordPress know what our default background color is.
+ 'default-color' => 'f1f1f1',
+ ) );
</ins><span class="cx">
</span><span class="cx"> // The custom header business starts here.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (20972 => 20973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2012-06-01 19:05:30 UTC (rev 20972)
+++ trunk/wp-includes/post-template.php 2012-06-01 20:31:50 UTC (rev 20973)
</span><span class="lines">@@ -501,7 +501,10 @@
</span><span class="cx"> if ( is_admin_bar_showing() )
</span><span class="cx"> $classes[] = 'admin-bar';
</span><span class="cx">
</span><del>- if ( get_background_image() || get_background_color() )
</del><ins>+ if ( get_theme_mod( 'background_image' ) || get_theme_mod( 'background_color' ) ||
+ ( '_custom_background_cb' != get_theme_support( 'custom-background', 'wp-head-callback' )
+ && ( get_theme_support( 'custom-background', 'default-image' ) ||
+ get_theme_support( 'custom-background', 'default-color' ) ) ) )
</ins><span class="cx"> $classes[] = 'custom-background';
</span><span class="cx">
</span><span class="cx"> $page = $wp_query->get( 'page' );
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (20972 => 20973)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2012-06-01 19:05:30 UTC (rev 20972)
+++ trunk/wp-includes/theme.php 2012-06-01 20:31:50 UTC (rev 20973)
</span><span class="lines">@@ -1102,8 +1102,9 @@
</span><span class="cx"> * @access protected
</span><span class="cx"> */
</span><span class="cx"> function _custom_background_cb() {
</span><del>- $background = get_background_image();
- $color = get_background_color();
</del><ins>+ $background = get_theme_mod( 'background_image' );
+ $color = get_theme_mod( 'background_color' );
+
</ins><span class="cx"> if ( ! $background && ! $color )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>