<!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>[17770] trunk: Fix hiding of header image.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17770">17770</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-29 19:45:30 +0000 (Fri, 29 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix hiding of header image. Fix radio selection when falling back to randomized default headers. Props lancewillett, kawauso. see <a href="http://trac.wordpress.org/ticket/17240">#17240</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.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 (17769 => 17770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2011-04-29 18:21:38 UTC (rev 17769)
+++ trunk/wp-admin/custom-header.php 2011-04-29 19:45:30 UTC (rev 17770)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['removeheader'] ) ) {
</span><span class="cx"> check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
</span><del>- set_theme_mod( 'header_image', '' );
</del><ins>+ set_theme_mod( 'header_image', 'remove-header' );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif;
</span><del>- if ( get_header_image() && !is_random_header_image() ) : ?>
</del><ins>+ if ( get_header_image() ) : ?>
</ins><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e( 'Remove Image' ); ?></th>
</span><span class="cx"> <td>
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif;
</span><span class="cx">
</span><del>- if ( defined( 'HEADER_IMAGE' ) && !is_random_header_image() ) : ?>
</del><ins>+ if ( defined( 'HEADER_IMAGE' ) && '' != HEADER_IMAGE ) : ?>
</ins><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row"><?php _e( 'Reset Image' ); ?></th>
</span><span class="cx"> <td>
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (17769 => 17770)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2011-04-29 18:21:38 UTC (rev 17769)
+++ trunk/wp-includes/theme.php 2011-04-29 19:45:30 UTC (rev 17770)
</span><span class="lines">@@ -1429,6 +1429,9 @@
</span><span class="cx"> $default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
</span><span class="cx"> $url = get_theme_mod( 'header_image', $default );
</span><span class="cx">
</span><ins>+ if ( 'remove-header' == $url )
+ return false;
+
</ins><span class="cx"> if ( is_random_header_image() )
</span><span class="cx"> $url = get_random_header_image();
</span><span class="cx">
</span><span class="lines">@@ -1489,6 +1492,8 @@
</span><span class="cx"> } else {
</span><span class="cx"> if ( "random-$type-image" == $header_image_mod )
</span><span class="cx"> return true;
</span><ins>+ elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>