<!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>[15196] trunk: Improve the custom background front-end callback.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15196">15196</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-10 18:28:25 +0000 (Thu, 10 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve the custom background front-end callback. Also, background-attachment should default to scroll, not fixed. fixes <a href="http://trac.wordpress.org/ticket/13751">#13751</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 (15195 => 15196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-06-10 18:26:53 UTC (rev 15195)
+++ trunk/wp-admin/custom-background.php 2010-06-10 18:28:25 UTC (rev 15196)
</span><span class="lines">@@ -281,11 +281,11 @@
</span><span class="cx"> <th scope="row"><?php _e( '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', 'fixed')); ?> />
</del><ins>+<input name="background-attachment" type="radio" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', 'scroll')); ?> />
</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', 'fixed')); ?> />
</del><ins>+<input name="background-attachment" type="radio" value="fixed" <?php checked('fixed', get_theme_mod('background_attachment', 'scroll')); ?> />
</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 (15195 => 15196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-06-10 18:26:53 UTC (rev 15195)
+++ trunk/wp-includes/theme.php 2010-06-10 18:28:25 UTC (rev 15196)
</span><span class="lines">@@ -1535,57 +1535,34 @@
</span><span class="cx"> function _custom_background_cb() {
</span><span class="cx"> $background = get_background_image();
</span><span class="cx"> $color = get_background_color();
</span><del>- if ( !$background && !$color )
</del><ins>+ if ( ! $background && ! $color )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- switch ( get_theme_mod('background_repeat', 'repeat') ) {
- case 'no-repeat':
- $repeat = 'background-repeat: no-repeat;';
- break;
- case 'repeat-x':
- $repeat = 'background-repeat: repeat-x;';
- break;
- case 'repeat-y':
- $repeat = 'background-repeat: repeat-y;';
- break;
- default:
- $repeat = 'background-repeat: repeat;';
- }
</del><ins>+ $style = $color ? "background-color: #$color;" : '';
</ins><span class="cx">
</span><del>- switch ( get_theme_mod('background_position_x', 'left') ) {
- case 'center':
- $position = 'background-position: top center;';
- break;
- case 'right':
- $position = 'background-position: top right;';
- break;
- default:
- $position = 'background-position: top left;';
- }
</del><ins>+ if ( $background ) {
+ $image = " background-image: url('$background');";
</ins><span class="cx">
</span><del>- if ( 'scroll' == get_theme_mod('background_attachment', 'fixed') )
- $attachment = 'background-attachment: scroll;';
- else
- $attachment = 'background-attachment: fixed;';
</del><ins>+ $repeat = get_theme_mod( 'background_repeat', 'repeat' );
+ if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
+ $repeat = 'repeat';
+ $repeat = " background-repeat: $repeat;";
+
+ $position = get_theme_mod( 'background_position_x', 'left' );
+ if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
+ $position = 'left';
+ $position = " background-position: top $position;";
+
+ $attachment = get_theme_mod( 'background_attachment', 'scroll' );
+ if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
+ $attachment = 'scroll';
+ $attachment = " background-attachment: $attachment;";
</ins><span class="cx">
</span><del>- if ( !empty($background ) )
- $image = "background-image: url('$background');";
- else
- $image = '';
-
- if ( !empty($color) )
- $color = "background-color: #$color;";
- else
- $color = '';
</del><ins>+ $style .= $image . $repeat . $position . $attachment;
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <style type="text/css">
</span><del>-body {
- <?php echo $image; ?>
- <?php echo $color; ?>
- <?php echo $repeat; ?>
- <?php echo $position; ?>
- <?php echo $attachment; ?>
-}
</del><ins>+body { <?php echo trim( $style ); ?> }
</ins><span class="cx"> </style>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>