<!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" />
<title>[18325] trunk: Add theme support option for turning on random default headers.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18325">18325</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-06-22 19:09:23 +0000 (Wed, 22 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add theme support option for turning on random default headers. fixes <a href="http://trac.wordpress.org/ticket/17832">#17832</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (18324 => 18325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php 2011-06-20 20:05:57 UTC (rev 18324)
+++ trunk/wp-content/themes/twentyeleven/functions.php 2011-06-22 19:09:23 UTC (rev 18325)
</span><span class="lines">@@ -109,12 +109,12 @@
</span><span class="cx"> // This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
</span><span class="cx"> add_theme_support( 'post-thumbnails' );
</span><span class="cx">
</span><del>- // The next four constants set how twentyeleven supports custom headers
</del><ins>+ // The next four constants set how Twenty Eleven supports custom headers.
</ins><span class="cx">
</span><span class="cx"> // The default header text color
</span><span class="cx"> define( 'HEADER_TEXTCOLOR', '000' );
</span><span class="cx">
</span><del>- // By leaving empty, we default to random image rotation
</del><ins>+ // By leaving empty, we allow for random image rotation.
</ins><span class="cx"> define( 'HEADER_IMAGE', '' );
</span><span class="cx">
</span><span class="cx"> // The height and width of your custom header.
</span><span class="lines">@@ -131,6 +131,9 @@
</span><span class="cx"> add_image_size( 'large-feature', HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT, true ); // Used for large feature (header) images
</span><span class="cx"> add_image_size( 'small-feature', 500, 300 ); // Used for featured posts if a large-feature doesn't exist
</span><span class="cx">
</span><ins>+ // Turn on random header image rotation by default.
+ add_theme_support( 'custom-header', array( 'random-default' => true ) );
+
</ins><span class="cx"> // Add a way for the custom header to be styled in the admin panel that controls
</span><span class="cx"> // custom headers. See twentyeleven_admin_header_style(), below.
</span><span class="cx"> add_custom_image_header( 'twentyeleven_header_style', 'twentyeleven_admin_header_style', 'twentyeleven_admin_header_image' );
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (18324 => 18325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2011-06-20 20:05:57 UTC (rev 18324)
+++ trunk/wp-includes/theme.php 2011-06-22 19:09:23 UTC (rev 18325)
</span><span class="lines">@@ -1460,8 +1460,15 @@
</span><span class="cx">
</span><span class="cx"> if ( 'random-uploaded-image' == $header_image_mod )
</span><span class="cx"> $headers = get_uploaded_header_images();
</span><del>- elseif ( ! empty( $_wp_default_headers ) )
- $headers = $_wp_default_headers;
</del><ins>+ elseif ( ! empty( $_wp_default_headers ) ) {
+ if ( 'random-default-image' == $header_image_mod ) {
+ $headers = $_wp_default_headers;
+ } else {
+ $is_random = get_theme_support( 'custom-header' );
+ if ( isset( $is_random[ 0 ] ) && !empty( $is_random[ 0 ][ 'random-default' ] ) )
+ $headers = $_wp_default_headers;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> if ( empty( $headers ) )
</span><span class="cx"> return '';
</span><span class="lines">@@ -1476,7 +1483,8 @@
</span><span class="cx"> * Check if random header image is in use.
</span><span class="cx"> *
</span><span class="cx"> * Always true if user expressly chooses the option in Appearance > Header.
</span><del>- * Also true if theme has multiple header images registered and no specific header image is chosen.
</del><ins>+ * Also true if theme has multiple header images registered, no specific header image
+ * is chosen, and theme turns on random headers with add_theme_support().
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.2.0
</span><span class="cx"> * @uses HEADER_IMAGE
</span><span class="lines">@@ -1494,7 +1502,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if ( "random-$type-image" == $header_image_mod )
</span><span class="cx"> return true;
</span><del>- elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
</del><ins>+ elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1557,7 +1565,11 @@
</span><span class="cx"> if ( ! empty( $header_callback ) )
</span><span class="cx"> add_action('wp_head', $header_callback);
</span><span class="cx">
</span><del>- add_theme_support( 'custom-header', array( 'callback' => $header_callback ) );
</del><ins>+ $support = array( 'callback' => $header_callback );
+ $theme_support = get_theme_support( 'custom-header' );
+ if ( ! empty( $theme_support ) && is_array( $theme_support[ 0 ] ) )
+ $support = array_merge( $theme_support[ 0 ], $support );
+ add_theme_support( 'custom-header', $support );
</ins><span class="cx"> add_theme_support( 'custom-header-uploads' );
</span><span class="cx">
</span><span class="cx"> if ( ! is_admin() )
</span></span></pre>
</div>
</div>
</body>
</html>