<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13189] trunk: Add defaults for background option radios.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13189">13189</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-18 03:12:05 +0000 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add defaults for background option radios. see <a href="http://trac.wordpress.org/ticket/12186">#12186</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (13188 => 13189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-02-18 03:01:45 UTC (rev 13188)
+++ trunk/wp-admin/custom-background.php 2010-02-18 03:12:05 UTC (rev 13189)
</span><span class="lines">@@ -172,37 +172,37 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Position' ); ?></span></legend>
</span><span class="cx"> <label>
</span><del>-<input name="background-position" type="radio" value="left" <?php checked('left', get_theme_mod('background_position')); ?> />
</del><ins>+<input name="background-position" type="radio" value="left" <?php checked('left', get_theme_mod('background_position', 'left')); ?> />
</ins><span class="cx"> <?php _e('Left') ?>
</span><span class="cx"> </label>
</span><span class="cx"> <label>
</span><del>-<input name="background-position" type="radio" value="center" <?php checked('center', get_theme_mod('background_position')); ?> />
</del><ins>+<input name="background-position" type="radio" value="center" <?php checked('center', get_theme_mod('background_position', 'left')); ?> />
</ins><span class="cx"> <?php _e('Center') ?>
</span><span class="cx"> </label>
</span><span class="cx"> <label>
</span><del>-<input name="background-position" type="radio" value="right" <?php checked('right', get_theme_mod('background_position')); ?> />
</del><ins>+<input name="background-position" type="radio" value="right" <?php checked('right', get_theme_mod('background_position', 'left')); ?> />
</ins><span class="cx"> <?php _e('Right') ?>
</span><span class="cx"> </label>
</span><span class="cx"> </fieldset></td>
</span><span class="cx">
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Repeat' ); ?></span></legend>
</span><span class="cx"> <label>
</span><del>-<input name="background-repeat" type="radio" value="no-repeat" <?php checked('no-repeat', get_theme_mod('background_repeat')); ?> />
</del><ins>+<input name="background-repeat" type="radio" value="no-repeat" <?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?> />
</ins><span class="cx"> <?php _e('No repeat') ?>
</span><span class="cx"> </label>
</span><span class="cx"> <label>
</span><del>-<input name="background-repeat" type="radio" value="repeat" <?php checked('repeat', get_theme_mod('background_repeat')); ?> />
</del><ins>+<input name="background-repeat" type="radio" value="repeat" <?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?> />
</ins><span class="cx"> <?php _e('Tile') ?>
</span><span class="cx"> </label>
</span><span class="cx"> </fieldset></td>
</span><span class="cx">
</span><span class="cx"> <td><fieldset><legend class="screen-reader-text"><span><?php _e( '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')); ?> />
</del><ins>+<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'fixed')); ?> />
</ins><span class="cx"> <?php _e('Scroll') ?>
</span><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')); ?> />
</del><ins>+<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'fixed')); ?> />
</ins><span class="cx"> <?php _e('Fixed') ?>
</span><span class="cx"> </label>
</span><span class="cx"> </fieldset></td>
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (13188 => 13189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-02-18 03:01:45 UTC (rev 13188)
+++ trunk/wp-includes/theme.php 2010-02-18 03:12:05 UTC (rev 13189)
</span><span class="lines">@@ -1372,6 +1372,9 @@
</span><span class="cx"> * @param callback $admin_image_div_callback Output a custom background image div on the custom background administration screen. Optional.
</span><span class="cx"> */
</span><span class="cx"> function add_custom_background($header_callback = '', $admin_header_callback = '', $admin_image_div_callback = '') {
</span><ins>+ if ( isset($GLOBALS['custom_background']) )
+ return;
+
</ins><span class="cx"> if ( empty($header_callback) )
</span><span class="cx"> $header_callback = '_custom_background_cb';
</span><span class="cx">
</span><span class="lines">@@ -1397,19 +1400,19 @@
</span><span class="cx"> if ( !$background )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $repeat = get_theme_mod('background_repeat');
</del><ins>+ $repeat = get_theme_mod('background_repeat', 'repeat');
</ins><span class="cx"> if ( 'no-repeat' == $repeat )
</span><span class="cx"> $repeat = 'background-repeat: no-repeat;';
</span><span class="cx"> else
</span><span class="cx"> $repeat = 'background-repeat: repeat;';
</span><del>- $position = get_theme_mod('background_position');
</del><ins>+ $position = get_theme_mod('background_position', 'left');
</ins><span class="cx"> if ( 'center' == $position )
</span><span class="cx"> $position = 'background-position-x: center;';
</span><span class="cx"> elseif ( 'right' == $position )
</span><span class="cx"> $position = 'background-position-x: right;';
</span><span class="cx"> else
</span><span class="cx"> $position = 'background-position-x: left;';
</span><del>- $attachment = get_theme_mod('background_attachment');
</del><ins>+ $attachment = get_theme_mod('background_attachment', 'fixed');
</ins><span class="cx"> if ( 'scroll' == $attachment )
</span><span class="cx"> $attachment = 'background-attachment: scroll;';
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>