<!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>[13404] trunk/wp-admin/custom-header.php: Default header selector,
  second pass.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13404">13404</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-25 19:32:10 +0000 (Thu, 25 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Default header selector, second pass. see <a href="http://trac.wordpress.org/ticket/12343">#12343</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (13403 => 13404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php        2010-02-25 19:18:44 UTC (rev 13403)
+++ trunk/wp-admin/custom-header.php        2010-02-25 19:32:10 UTC (rev 13404)
</span><span class="lines">@@ -131,12 +131,14 @@
</span><span class="cx">                                         set_theme_mod('header_textcolor', $color);
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><ins>+
</ins><span class="cx">                 if ( isset($_POST['resetheader']) ) {
</span><span class="cx">                         check_admin_referer('custom-header');
</span><span class="cx">                         remove_theme_mods();
</span><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 if ( isset($_POST['default-header']) ) {
</span><ins>+                        check_admin_referer('custom-header');
</ins><span class="cx">                         $this-&gt;process_default_headers();
</span><span class="cx">                         if ( isset($this-&gt;default_headers[$_POST['default-header']]) )
</span><span class="cx">                                 set_theme_mod('header_image', esc_url($this-&gt;default_headers[$_POST['default-header']]['url']));
</span><span class="lines">@@ -396,7 +398,7 @@
</span><span class="cx">         echo '&lt;form method=&quot;post&quot; action=&quot;' . admin_url('themes.php?page=custom-header&amp;amp;updated=true') . '&quot;&gt;';
</span><span class="cx">         wp_nonce_field('custom-header');
</span><span class="cx">         $this-&gt;show_default_header_selector();
</span><del>-        echo '&lt;input type=&quot;submit&quot; class=&quot;button&quot; value=&quot;' . esc_attr__('Save Your Choice') . '&quot;  /&gt;';
</del><ins>+        echo '&lt;input type=&quot;submit&quot; class=&quot;button&quot; value=&quot;' . esc_attr__('Save Changes') . '&quot;  /&gt;';
</ins><span class="cx">         echo '&lt;/form&gt;';
</span><span class="cx">         echo '&lt;/div&gt;';
</span><span class="cx"> endif;
</span><span class="lines">@@ -419,10 +421,22 @@
</span><span class="cx">                 &lt;?php if ( get_theme_mod('header_image') || get_theme_mod('header_textcolor') ) : ?&gt;
</span><span class="cx"> &lt;div class=&quot;wrap&quot;&gt;
</span><span class="cx"> &lt;h2&gt;&lt;?php _e('Reset Header Image and Color'); ?&gt;&lt;/h2&gt;
</span><ins>+&lt;form method=&quot;post&quot; action=&quot;&lt;?php echo esc_attr(add_query_arg('step', 1)) ?&gt;&quot;&gt;
+&lt;?php
+wp_nonce_field('custom-header');
+if ( !empty($this-&gt;default_headers) ) {
+?&gt;
+&lt;p&gt;&lt;?php _e('Use one of these cool headers.') ?&gt;&lt;/p&gt;
+&lt;?php
+        $this-&gt;show_default_header_selector();
+?&gt;
+        &lt;input type=&quot;submit&quot; class=&quot;button&quot; name=&quot;resetheader&quot; value=&quot;&lt;?php esc_attr_e('Save Changes'); ?&gt;&quot; /&gt;
+&lt;?php
+} else {
+?&gt;
</ins><span class="cx"> &lt;p&gt;&lt;?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?&gt;&lt;/p&gt;
</span><del>-&lt;form method=&quot;post&quot; action=&quot;&lt;?php echo esc_attr(add_query_arg('step', 1)) ?&gt;&quot;&gt;
-&lt;?php wp_nonce_field('custom-header'); ?&gt;
</del><span class="cx"> &lt;input type=&quot;submit&quot; class=&quot;button&quot; name=&quot;resetheader&quot; value=&quot;&lt;?php esc_attr_e('Restore Original Header'); ?&gt;&quot; /&gt;
</span><ins>+&lt;?php } ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx">                 &lt;?php endif;
</span></span></pre>
</div>
</div>

</body>
</html>