<!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>[14002] trunk/wp-content/themes/twentyten/header.php:
Move all Feature Images => header image integration into a is_singular()
check.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14002">14002</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-05 02:58:39 +0000 (Mon, 05 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move all Feature Images => header image integration into a is_singular() check. Prevents a PHP notice when $post is not set (For example, a 404 page). Fixes <a href="http://trac.wordpress.org/ticket/12661">#12661</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (14001 => 14002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-04-05 00:00:53 UTC (rev 14001)
+++ trunk/wp-content/themes/twentyten/header.php 2010-04-05 02:58:39 UTC (rev 14002)
</span><span class="lines">@@ -44,19 +44,18 @@
</span><span class="cx"> <div id="branding">
</span><span class="cx"> <?php if ( is_home() || is_front_page() ) { ?>
</span><span class="cx"> <h1 id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></h1>
</span><del>- <?php } else { ?>
</del><ins>+ <?php } else { ?>
</ins><span class="cx"> <div id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div id="site-description"><?php bloginfo( 'description' ); ?></div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- // Retrieve the dimensions of the current post thumbnail -- no teensy header images for us!
- $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail');
- list($src, $width, $height) = $image;
-
</del><span class="cx"> // Check if this is a post or page, if it has a thumbnail, and if it's a big one
</span><del>- if ( is_singular() && has_post_thumbnail( $post->ID ) && $width >= HEADER_IMAGE_WIDTH ) :
</del><ins>+ if ( is_singular() &&
+ has_post_thumbnail( $post->ID ) &&
+ ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail') ) &&
+ $image[1] >= HEADER_IMAGE_WIDTH ) :
</ins><span class="cx"> // Houston, we have a new header image!
</span><span class="cx"> echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
</span><span class="cx"> else : ?>
</span></span></pre>
</div>
</div>
</body>
</html>