<!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>[21328] trunk/wp-content/themes/twentytwelve/inc/custom-header.php: Twenty Twelve: remove back compat for custom header image, installs prior to 3.4 will not see it as an option.</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://core.trac.wordpress.org/changeset/21328">21328</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-07-25 17:12:40 +0000 (Wed, 25 Jul 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: remove back compat for custom header image, installs prior to 3.4 will not see it as an option. Props obenland, closes <a href="http://core.trac.wordpress.org/ticket/21231">#21231</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelveinccustomheaderphp">trunk/wp-content/themes/twentytwelve/inc/custom-header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelveinccustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/inc/custom-header.php (21327 => 21328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/inc/custom-header.php 2012-07-25 16:51:23 UTC (rev 21327)
+++ trunk/wp-content/themes/twentytwelve/inc/custom-header.php 2012-07-25 17:12:40 UTC (rev 21328)
</span><span class="lines">@@ -9,39 +9,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Back compat support for get_custom_header().
- * New since WordPress version 3.4.
</del><ins>+ * Set up the WordPress core custom header arguments and settings.
</ins><span class="cx"> *
</span><del>- * To provide backward compatibility with previous versions, we
- * will define our own version of this function.
- *
- * @todo Should this go into core instead?
- *
- * @return stdClass All properties represent attributes of the current header image.
- *
- * @package Twenty_Twelve
- * @since Twenty Twelve 1.0
- */
-if ( ! function_exists( 'get_custom_header' ) ) {
- function get_custom_header() {
- return (object) array(
- 'url' => get_header_image(),
- 'thumbnail_url' => get_header_image(),
- 'width' => HEADER_IMAGE_WIDTH,
- 'height' => HEADER_IMAGE_HEIGHT
- );
- }
-}
-
-/**
- * Setup the WordPress core custom header arguments and settings.
- *
</del><span class="cx"> * Use add_theme_support() to register support for WordPress 3.4+
</span><del>- * as well as provide backward compatibility for previous versions.
</del><span class="cx"> *
</span><del>- * Use feature detection of wp_get_theme() which was introduced
- * in WordPress 3.4.
- *
</del><span class="cx"> * @uses twentytwelve_header_style()
</span><span class="cx"> * @uses twentytwelve_admin_header_style()
</span><span class="cx"> * @uses twentytwelve_admin_header_image()
</span><span class="lines">@@ -72,19 +43,8 @@
</span><span class="cx"> 'admin-preview-callback' => 'twentytwelve_admin_header_image',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Allow child themes to filter any of these arguments.
- $args = apply_filters( 'twentytwelve_custom_header_args', $args );
-
- if ( function_exists( 'wp_get_theme' ) ) {
- add_theme_support( 'custom-header', $args );
- } else {
- // Back compat for < 3.4 versions.
- define( 'HEADER_TEXTCOLOR', $args['default-text-color'] );
- define( 'HEADER_IMAGE', $args['default-image'] );
- define( 'HEADER_IMAGE_WIDTH', $args['width'] );
- define( 'HEADER_IMAGE_HEIGHT', $args['height'] );
- add_custom_image_header( $args['wp-head-callback'], $args['admin-head-callback'], $args['admin-preview-callback'] );
- }
</del><ins>+ // Add support and allow child themes to filter any of these arguments.
+ add_theme_support( 'custom-header', apply_filters( 'twentytwelve_custom_header_args', $args ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'after_setup_theme', 'twentytwelve_custom_header_setup' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>