<!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>[14535] trunk/wp-content/themes/twentyten/header.php: I18n fixes for header
 .php in Twentyten.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14535">14535</a></dd>
<dt>Author</dt> <dd>nbachiyski</dd>
<dt>Date</dt> <dd>2010-05-10 06:04:14 +0000 (Mon, 10 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>I18n fixes for header.php in Twentyten. Props zeo. See <a href="http://trac.wordpress.org/ticket/13198">#13198</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 (14534 => 14535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php        2010-05-10 05:58:24 UTC (rev 14534)
+++ trunk/wp-content/themes/twentyten/header.php        2010-05-10 06:04:14 UTC (rev 14535)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">         ?&gt;&lt;/title&gt;
</span><span class="cx">         &lt;link rel=&quot;profile&quot; href=&quot;http://gmpg.org/xfn/11&quot; /&gt;
</span><span class="cx">         &lt;link rel=&quot;stylesheet&quot; type=&quot;text/css&quot; media=&quot;all&quot; href=&quot;&lt;?php bloginfo( 'stylesheet_url' ); ?&gt;&quot; /&gt;
</span><del>-        &lt;?php if ( is_singular() &amp;&amp; get_option('thread_comments') ) wp_enqueue_script( 'comment-reply' ); ?&gt;
</del><ins>+        &lt;?php if ( is_singular() &amp;&amp; get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); ?&gt;
</ins><span class="cx">         &lt;link rel=&quot;pingback&quot; href=&quot;&lt;?php bloginfo( 'pingback_url' ); ?&gt;&quot; /&gt;
</span><span class="cx">         &lt;?php wp_head(); ?&gt;
</span><span class="cx"> &lt;/head&gt;
</span><span class="lines">@@ -45,19 +45,19 @@
</span><span class="cx">         &lt;div id=&quot;header&quot;&gt;
</span><span class="cx">                 &lt;div id=&quot;masthead&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;branding&quot;&gt;
</span><del>-                                &lt;?php if ( is_home() || is_front_page() ) { ?&gt;
-                                        &lt;h1 id=&quot;site-title&quot;&gt;&lt;span&gt;&lt;a href=&quot;&lt;?php echo home_url( '/' ); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?&gt;&quot; rel=&quot;home&quot;&gt;&lt;?php bloginfo( 'name' ); ?&gt;&lt;/a&gt;&lt;/span&gt;&lt;/h1&gt;
-                                &lt;?php } else { ?&gt;
-                                        &lt;div id=&quot;site-title&quot;&gt;&lt;span&gt;&lt;a href=&quot;&lt;?php echo home_url( '/' ); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?&gt;&quot; rel=&quot;home&quot;&gt;&lt;?php bloginfo( 'name' ); ?&gt;&lt;/a&gt;&lt;/span&gt;&lt;/div&gt;
-                                &lt;?php } ?&gt;
-                                
</del><ins>+                                &lt;?php $heading_tag = ( is_home() || is_front_page() )? 'h1' : 'div'; ?&gt;
+                                &lt;&lt;?php echo $heading_tag; ?&gt; id=&quot;site-title&quot;&gt;
+                                        &lt;span&gt;
+                                                &lt;a href=&quot;&lt;?php echo home_url( '/' ); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?&gt;&quot; rel=&quot;home&quot;&gt;&lt;?php bloginfo( 'name' ); ?&gt;&lt;/a&gt;
+                                        &lt;/span&gt;
+                                &lt;/&lt;?php echo $heading_tag; ?&gt;&gt;                                
</ins><span class="cx">                                 &lt;div id=&quot;site-description&quot;&gt;&lt;?php bloginfo( 'description' ); ?&gt;&lt;/div&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php
</span><span class="cx">                                         // Check if this is a post or page, if it has a thumbnail, and if it's a big one
</span><span class="cx">                                         if ( is_singular() &amp;&amp;
</span><span class="cx">                                                         has_post_thumbnail( $post-&gt;ID ) &amp;&amp;
</span><del>-                                                        ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post-&gt;ID ), 'post-thumbnail') ) &amp;&amp;
</del><ins>+                                                        ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post-&gt;ID ), 'post-thumbnail' ) ) &amp;&amp;
</ins><span class="cx">                                                         $image[1] &gt;= HEADER_IMAGE_WIDTH ) :
</span><span class="cx">                                                 // Houston, we have a new header image!
</span><span class="cx">                                                 echo get_the_post_thumbnail( $post-&gt;ID, 'post-thumbnail' );
</span></span></pre>
</div>
</div>

</body>
</html>