
<!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>[14628] trunk/wp-admin/custom-background.php: Ensure validation.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14628">14628</a></dd>

<dt>Author</dt> <dd>nacin</dd>

<dt>Date</dt> <dd>2010-05-14 08:20:06 +0000 (Fri, 14 May 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Ensure validation. props Utkarsh, see <a href="http://trac.wordpress.org/ticket/13383">#13383</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 (14627 => 14628)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/custom-background.php        2010-05-14 08:11:22 UTC (rev 14627)

+++ trunk/wp-admin/custom-background.php        2010-05-14 08:20:06 UTC (rev 14628)

</span><span class="lines">@@ -155,7 +155,10 @@

</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><span class="cx"> &lt;?php

</span><del>-$background_styles = &quot;background-color: #&quot; . get_background_color() . &quot;;&quot;;

</del><ins>+$background_styles = '';

+if ( get_background_color() ) {

+        $background_styles .= &quot;background-color: #&quot; . get_background_color() . &quot;;&quot;;

+}

</ins><span class="cx"> 

</span><span class="cx"> if ( get_background_image() ) { 

</span><span class="cx">         $background_styles .= &quot;

</span><span class="lines">@@ -202,7 +205,7 @@

</span><span class="cx"> &lt;?php endif; ?&gt;

</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('Upload Image'); ?&gt;&lt;/th&gt;

</span><del>-&lt;td&gt;&lt;form enctype=&quot;multipart/form-data&quot; id=&quot;uploadForm&quot; method=&quot;POST&quot; action=&quot;&quot;&gt;

</del><ins>+&lt;td&gt;&lt;form enctype=&quot;multipart/form-data&quot; id=&quot;uploadForm&quot; method=&quot;post&quot; action=&quot;&quot;&gt;

</ins><span class="cx"> &lt;label for=&quot;upload&quot;&gt;&lt;?php _e('Choose an image from your computer:'); ?&gt;&lt;/label&gt;&lt;br /&gt;&lt;input type=&quot;file&quot; id=&quot;upload&quot; name=&quot;import&quot; /&gt;

</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;save&quot; /&gt;

</span><span class="cx"> &lt;?php wp_nonce_field('custom-background') ?&gt;

</span></span></pre>

</div>

</div>


</body>

</html>