<!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>[14624] trunk/wp-admin/custom-background.php:
  Use inline styles in custom background admin,
  and prepopulate background options.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14624">14624</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-14 06:48:47 +0000 (Fri, 14 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use inline styles in custom background admin, and prepopulate background options. props jshreve, 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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (14623 => 14624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php        2010-05-14 06:44:54 UTC (rev 14623)
+++ trunk/wp-admin/custom-background.php        2010-05-14 06:48:47 UTC (rev 14624)
</span><span class="lines">@@ -154,18 +154,19 @@
</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;
</span><span class="cx"> &lt;th scope=&quot;row&quot;&gt;&lt;?php _e('Current Background'); ?&gt;&lt;/th&gt;
</span><span class="cx"> &lt;td&gt;
</span><del>-&lt;style type=&quot;text/css&quot;&gt;
-#custom-background-image {
-        background-color: #&lt;?php echo get_background_color()?&gt;;
-        &lt;?php if ( get_background_image() ) { ?&gt;
-        background: url(&lt;?php echo get_theme_mod('background_image_thumb', ''); ?&gt;);
-        background-repeat: &lt;?php echo get_theme_mod('background_repeat', 'no-repeat'); ?&gt;;
-        background-position: top &lt;?php echo get_theme_mod('background_position', 'left'); ?&gt;;
-        background-attachment: &lt;?php echo get_theme_mod('background_position', 'fixed'); ?&gt;;
-        &lt;?php } ?&gt;
</del><ins>+&lt;?php
+$background_styles = &quot;background-color: #&quot; . get_background_color() . &quot;;&quot;;
+
+if ( get_background_image() ) { 
+        $background_styles .= &quot;
+        background-image: url(&quot; . get_theme_mod('background_image_thumb', '') . &quot;);
+        background-repeat: &quot;. get_theme_mod('background_repeat', 'no-repeat') . &quot;;
+        background-position: top &quot;. get_theme_mod('background_position', 'left') . &quot;;
+        background-attachment: &quot; . get_theme_mod('background_position', 'fixed') . &quot;;
+        &quot;;
</ins><span class="cx"> }
</span><del>-&lt;/style&gt;
-&lt;div id=&quot;custom-background-image&quot;&gt;
</del><ins>+?&gt;
+&lt;div id=&quot;custom-background-image&quot; style=&quot;&lt;?php echo $background_styles; ?&gt;&quot;&gt;
</ins><span class="cx"> &lt;?php if ( get_background_image() ) { ?&gt;
</span><span class="cx"> &lt;img class=&quot;custom-background-image&quot; src=&quot;&lt;?php echo get_theme_mod('background_image_thumb', ''); ?&gt;&quot; style=&quot;visibility:hidden;&quot; /&gt;&lt;br /&gt;
</span><span class="cx"> &lt;img class=&quot;custom-background-image&quot; src=&quot;&lt;?php echo get_theme_mod('background_image_thumb', ''); ?&gt;&quot; style=&quot;visibility:hidden;&quot; /&gt;
</span><span class="lines">@@ -325,6 +326,10 @@
</span><span class="cx"> 
</span><span class="cx">                 $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
</span><span class="cx">                 set_theme_mod('background_image_thumb', esc_url( $thumbnail[0] ) );
</span><ins>+                
+                set_theme_mod('background_position', get_theme_mod('background_position', 'left') );
+                set_theme_mod('background_repeat', get_theme_mod('background_repeat', 'tile') );
+                set_theme_mod('background-attachment',  get_theme_mod('background_position', 'fixed') );
</ins><span class="cx"> 
</span><span class="cx">                 do_action('wp_create_file_in_uploads', $file, $id); // For replication
</span><span class="cx">                 $this-&gt;updated = true;
</span></span></pre>
</div>
</div>

</body>
</html>