<!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>[26352] trunk/src: Allow customisation of theme mod defaults via custom-background theme support.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/26352">26352</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2013-11-24 14:04:50 +0000 (Sun, 24 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow customisation of theme mod defaults via custom-background theme support.
Give the power to theme authors to select defaults when registering
custom-background support.
Props obenland. Fixes <a href="http://core.trac.wordpress.org/ticket/20816">#20816</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-background.php (26351 => 26352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-background.php 2013-11-24 13:56:43 UTC (rev 26351)
+++ trunk/src/wp-admin/custom-background.php 2013-11-24 14:04:50 UTC (rev 26352)
</span><span class="lines">@@ -206,8 +206,8 @@
</span><span class="cx"> $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', get_background_image() ) ) ) );
</span><span class="cx"> // background-image URL must be single quote, see below
</span><span class="cx"> $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
</span><del>- . ' background-repeat: ' . get_theme_mod('background_repeat', 'repeat') . ';'
- . ' background-position: top ' . get_theme_mod('background_position_x', 'left');
</del><ins>+ . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) . ';'
+ . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) );
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // must be double quote, see above ?>
</span><span class="lines">@@ -277,15 +277,15 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Position' ); ?></th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Position' ); ?></span></legend>
</span><span class="cx"> <label>
</span><del>-<input name="background-position-x" type="radio" value="left"<?php checked('left', get_theme_mod('background_position_x', 'left')); ?> />
</del><ins>+<input name="background-position-x" type="radio" value="left"<?php checked( 'left', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) ) ); ?> />
</ins><span class="cx"> <?php _e('Left') ?>
</span><span class="cx"> </label>
</span><span class="cx"> <label>
</span><del>-<input name="background-position-x" type="radio" value="center"<?php checked('center', get_theme_mod('background_position_x', 'left')); ?> />
</del><ins>+<input name="background-position-x" type="radio" value="center"<?php checked( 'center', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) ) ); ?> />
</ins><span class="cx"> <?php _e('Center') ?>
</span><span class="cx"> </label>
</span><span class="cx"> <label>
</span><del>-<input name="background-position-x" type="radio" value="right"<?php checked('right', get_theme_mod('background_position_x', 'left')); ?> />
</del><ins>+<input name="background-position-x" type="radio" value="right"<?php checked( 'right', get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) ) ); ?> />
</ins><span class="cx"> <?php _e('Right') ?>
</span><span class="cx"> </label>
</span><span class="cx"> </fieldset></td>
</span><span class="lines">@@ -294,10 +294,10 @@
</span><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e( 'Repeat' ); ?></th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
</span><del>-<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('No Repeat'); ?></label>
- <label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile'); ?></label>
- <label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile Horizontally'); ?></label>
- <label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile Vertically'); ?></label>
</del><ins>+<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked( 'no-repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('No Repeat'); ?></label>
+ <label><input type="radio" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('Tile'); ?></label>
+ <label><input type="radio" name="background-repeat" value="repeat-x"<?php checked( 'repeat-x', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('Tile Horizontally'); ?></label>
+ <label><input type="radio" name="background-repeat" value="repeat-y"<?php checked( 'repeat-y', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) ) ); ?> /> <?php _e('Tile Vertically'); ?></label>
</ins><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="lines">@@ -305,12 +305,12 @@
</span><span class="cx"> <th scope="row"><?php _ex( 'Attachment', 'Background Attachment' ); ?></th>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Attachment' ); ?></span></legend>
</span><span class="cx"> <label>
</span><del>-<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'scroll')); ?> />
-<?php _e('Scroll') ?>
</del><ins>+<input name="background-attachment" type="radio" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) ) ); ?> />
+<?php _e( 'Scroll' ); ?>
</ins><span class="cx"> </label>
</span><span class="cx"> <label>
</span><del>-<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'scroll')); ?> />
-<?php _e('Fixed') ?>
</del><ins>+<input name="background-attachment" type="radio" value="fixed" <?php checked( 'fixed', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) ) ); ?> />
+<?php _e( 'Fixed' ); ?>
</ins><span class="cx"> </label>
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/theme.php (26351 => 26352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/theme.php 2013-11-24 13:56:43 UTC (rev 26351)
+++ trunk/src/wp-includes/theme.php 2013-11-24 14:04:50 UTC (rev 26352)
</span><span class="lines">@@ -1171,17 +1171,17 @@
</span><span class="cx"> if ( $background ) {
</span><span class="cx"> $image = " background-image: url('$background');";
</span><span class="cx">
</span><del>- $repeat = get_theme_mod( 'background_repeat', 'repeat' );
</del><ins>+ $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'background-repeat' ) );
</ins><span class="cx"> if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
</span><span class="cx"> $repeat = 'repeat';
</span><span class="cx"> $repeat = " background-repeat: $repeat;";
</span><span class="cx">
</span><del>- $position = get_theme_mod( 'background_position_x', 'left' );
</del><ins>+ $position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'background-position' ) );
</ins><span class="cx"> if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
</span><span class="cx"> $position = 'left';
</span><span class="cx"> $position = " background-position: top $position;";
</span><span class="cx">
</span><del>- $attachment = get_theme_mod( 'background_attachment', 'scroll' );
</del><ins>+ $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'background-attachment' ) );
</ins><span class="cx"> if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
</span><span class="cx"> $attachment = 'scroll';
</span><span class="cx"> $attachment = " background-attachment: $attachment;";
</span><span class="lines">@@ -1373,10 +1373,13 @@
</span><span class="cx"> $args = array( 0 => array() );
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'default-image' => '',
- 'default-color' => '',
- 'wp-head-callback' => '_custom_background_cb',
- 'admin-head-callback' => '',
</del><ins>+ 'default-image' => '',
+ 'background-repeat' => 'repeat',
+ 'background-position' => 'left',
+ 'background-attachment' => 'scroll',
+ 'default-color' => '',
+ 'wp-head-callback' => '_custom_background_cb',
+ 'admin-head-callback' => '',
</ins><span class="cx"> 'admin-preview-callback' => '',
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>