<!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>[18253] trunk/wp-content/themes/twentyeleven: Twenty Eleven code review and cleanup, props dd32, fixes #17748</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/18253">18253</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-06-10 23:01:16 +0000 (Fri, 10 Jun 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Eleven code review and cleanup, props dd32, fixes <a href="http://trac.wordpress.org/ticket/17748">#17748</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenarchivephp">trunk/wp-content/themes/twentyeleven/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenauthorphp">trunk/wp-content/themes/twentyeleven/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentasidephp">trunk/wp-content/themes/twentyeleven/content-aside.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentimagephp">trunk/wp-content/themes/twentyeleven/content-image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentlinkphp">trunk/wp-content/themes/twentyeleven/content-link.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentquotephp">trunk/wp-content/themes/twentyeleven/content-quote.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentsinglephp">trunk/wp-content/themes/twentyeleven/content-single.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentstatusphp">trunk/wp-content/themes/twentyeleven/content-status.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentphp">trunk/wp-content/themes/twentyeleven/content.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsphp">trunk/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevensinglephp">trunk/wp-content/themes/twentyeleven/single.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/archive.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/archive.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/archive.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -17,17 +17,6 @@
</span><span class="cx">                 &lt;section id=&quot;primary&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;content&quot; role=&quot;main&quot;&gt;
</span><span class="cx"> 
</span><del>-                                &lt;?php
-                                        /* Queue the first post, that way we know
-                                         * what date we're dealing with (if that is the case).
-                                         *
-                                         * We reset this later so we can run the loop
-                                         * properly with a call to rewind_posts().
-                                         */
-                                        if ( have_posts() )
-                                                the_post();
-                                ?&gt;
-
</del><span class="cx">                                 &lt;header class=&quot;page-header&quot;&gt;
</span><span class="cx">                                         &lt;h1 class=&quot;page-title&quot;&gt;
</span><span class="cx">                                                 &lt;?php if ( is_day() ) : ?&gt;
</span><span class="lines">@@ -42,14 +31,6 @@
</span><span class="cx">                                         &lt;/h1&gt;
</span><span class="cx">                                 &lt;/header&gt;
</span><span class="cx"> 
</span><del>-                                &lt;?php
-                                        /* Since we called the_post() above, we need to
-                                         * rewind the loop back to the beginning that way
-                                         * we can run the loop properly, in full.
-                                         */
-                                        rewind_posts();
-                                ?&gt;
-
</del><span class="cx">                                 &lt;?php twentyeleven_content_nav( 'nav-above' ); ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php /* Start the Loop */ ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/author.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/author.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/author.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php
</span><span class="cx">                                         /* Queue the first post, that way we know
</span><del>-                                         * what date we're dealing with (if that is the case).
</del><ins>+                                         * what author we're dealing with (if that is the case).
</ins><span class="cx">                                          *
</span><span class="cx">                                          * We reset this later so we can run the loop
</span><span class="cx">                                          * properly with a call to rewind_posts().
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentasidephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-aside.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-aside.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content-aside.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">                                 &lt;h2 class=&quot;entry-format&quot;&gt;&lt;?php _e( 'Aside', 'twentyeleven' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                         &lt;/hgroup&gt;
</span><span class="cx"> 
</span><del>-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : ?&gt;
</del><ins>+                        &lt;?php if ( 'post' == get_post_type() ) : ?&gt;
</ins><span class="cx">                         &lt;?php endif; ?&gt;
</span><span class="cx">                         
</span><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-image.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-image.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content-image.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">                 &lt;/div&gt;&lt;!-- .entry-content --&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;footer class=&quot;entry-meta&quot;&gt;
</span><del>-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : // Hide category and tag text for pages on Search ?&gt;
</del><ins>+                        &lt;?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?&gt;
</ins><span class="cx">                         &lt;div class=&quot;entry-meta&quot;&gt;
</span><span class="cx">                                 &lt;?php
</span><span class="cx">                                         printf( __( '&lt;a href=&quot;%1$s&quot; rel=&quot;bookmark&quot;&gt;&lt;time class=&quot;entry-date&quot; datetime=&quot;%2$s&quot; pubdate&gt;%3$s&lt;/time&gt;&lt;/a&gt;&lt;/a&gt;&lt;span class=&quot;by-author&quot;&gt; &lt;span class=&quot;sep&quot;&gt; by &lt;/span&gt; &lt;span class=&quot;author vcard&quot;&gt;&lt;a class=&quot;url fn n&quot; href=&quot;%4$s&quot; title=&quot;%5$s&quot; rel=&quot;author&quot;&gt;%6$s&lt;/a&gt;&lt;/span&gt;&lt;/span&gt;', 'twentyeleven' ),
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-link.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-link.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content-link.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">                                 &lt;h2 class=&quot;entry-format&quot;&gt;&lt;?php _e( 'Link', 'twentyeleven' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                         &lt;/hgroup&gt;
</span><span class="cx"> 
</span><del>-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : ?&gt;
</del><ins>+                        &lt;?php if ( 'post' == get_post_type() ) : ?&gt;
</ins><span class="cx">                         &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentquotephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-quote.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-quote.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content-quote.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">                                 &lt;h2 class=&quot;entry-format&quot;&gt;&lt;?php _e( 'Quote', 'twentyeleven' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                         &lt;/hgroup&gt;
</span><span class="cx"> 
</span><del>-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : ?&gt;
</del><ins>+                        &lt;?php if ( 'post' == get_post_type() ) : ?&gt;
</ins><span class="cx">                         &lt;div class=&quot;entry-meta&quot;&gt;
</span><span class="cx">                                 &lt;?php twentyeleven_posted_on(); ?&gt;
</span><span class="cx">                         &lt;/div&gt;&lt;!-- .entry-meta --&gt;
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> 
</span><span class="cx">                 &lt;footer class=&quot;entry-meta&quot;&gt;
</span><span class="cx">                         &lt;?php $show_sep = false; ?&gt;
</span><del>-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : // Hide category and tag text for pages on Search ?&gt;
</del><ins>+                        &lt;?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?&gt;
</ins><span class="cx">                         &lt;?php
</span><span class="cx">                                 /* translators: used between list items, there is a space after the comma */
</span><span class="cx">                                 $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-single.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-single.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content-single.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -12,9 +12,11 @@
</span><span class="cx">         &lt;header class=&quot;entry-header&quot;&gt;
</span><span class="cx">                 &lt;h1 class=&quot;entry-title&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/h1&gt;
</span><span class="cx"> 
</span><ins>+                &lt;?php if ( 'post' == get_post_type() ) : /* Bit of a disconnect here, Some files include this test, not all do. */ ?&gt;
</ins><span class="cx">                 &lt;div class=&quot;entry-meta&quot;&gt;
</span><span class="cx">                         &lt;?php twentyeleven_posted_on(); ?&gt;
</span><span class="cx">                 &lt;/div&gt;&lt;!-- .entry-meta --&gt;
</span><ins>+                &lt;?php endif; ?&gt;
</ins><span class="cx">         &lt;/header&gt;&lt;!-- .entry-header --&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;div class=&quot;entry-content&quot;&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentstatusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-status.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-status.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content-status.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -15,9 +15,6 @@
</span><span class="cx">                                 &lt;h1 class=&quot;entry-title&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h1&gt;
</span><span class="cx">                                 &lt;h2 class=&quot;entry-format&quot;&gt;&lt;?php _e( 'Status', 'twentyeleven' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                         &lt;/hgroup&gt;
</span><del>-
-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : ?&gt;
-                        &lt;?php endif; ?&gt;
</del><span class="cx">                         
</span><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span><span class="cx">                         &lt;div class=&quot;comments-link&quot;&gt;
</span><span class="lines">@@ -32,7 +29,7 @@
</span><span class="cx">                 &lt;/div&gt;&lt;!-- .entry-summary --&gt;
</span><span class="cx">                 &lt;?php else : ?&gt;
</span><span class="cx">                 &lt;div class=&quot;entry-content&quot;&gt;
</span><del>-                        &lt;div class=&quot;avatar&quot;&gt;&lt;?php echo get_avatar( $post-&gt;post_author, apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?&gt;&lt;/div&gt;
</del><ins>+                        &lt;div class=&quot;avatar&quot;&gt;&lt;?php echo get_avatar( get_the_author_meta( 'ID' ), apply_filters( 'twentyeleven_status_avatar', '65' ) ); ?&gt;&lt;/div&gt;
</ins><span class="cx">                         
</span><span class="cx">                         &lt;?php the_content( __( 'Continue reading &lt;span class=&quot;meta-nav&quot;&gt;&amp;rarr;&lt;/span&gt;', 'twentyeleven' ) ); ?&gt;
</span><span class="cx">                         &lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-link&quot;&gt;' . __( 'Pages:', 'twentyeleven' ), 'after' =&gt; '&lt;/div&gt;' ) ); ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/content.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -12,14 +12,14 @@
</span><span class="cx">                 &lt;header class=&quot;entry-header&quot;&gt;
</span><span class="cx">                         &lt;?php if ( is_sticky() ) : ?&gt;
</span><span class="cx">                                 &lt;hgroup&gt;
</span><del>-                                        &lt;h1 class=&quot;entry-title&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h1&gt;
</del><ins>+                                        &lt;h1 class=&quot;entry-title&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) /* Y NO ARRAY! */ ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h1&gt;
</ins><span class="cx">                                         &lt;h2 class=&quot;entry-format&quot;&gt;&lt;?php _e( 'Featured', 'twentyeleven' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                                 &lt;/hgroup&gt;
</span><span class="cx">                         &lt;?php else : ?&gt;
</span><span class="cx">                         &lt;h1 class=&quot;entry-title&quot;&gt;&lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot; title=&quot;&lt;?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?&gt;&quot; rel=&quot;bookmark&quot;&gt;&lt;?php the_title(); ?&gt;&lt;/a&gt;&lt;/h1&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><del>-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : ?&gt;
</del><ins>+                        &lt;?php if ( 'post' == get_post_type() ) : ?&gt;
</ins><span class="cx">                         &lt;div class=&quot;entry-meta&quot;&gt;
</span><span class="cx">                                 &lt;?php twentyeleven_posted_on(); ?&gt;
</span><span class="cx">                         &lt;/div&gt;&lt;!-- .entry-meta --&gt;
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx">                 &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx">                 &lt;footer class=&quot;entry-meta&quot;&gt;
</span><del>-                        &lt;?php $show_sep = false; ?&gt;
-                        &lt;?php if ( 'post' == $post-&gt;post_type ) : // Hide category and tag text for pages on Search ?&gt;
</del><ins>+                        &lt;?php $show_sep = false; //  perhaps a implode(' | ', $utilities) could be used instead of this $show_sep business? ?&gt;
+                        &lt;?php if ( 'post' == get_post_type() ) : // Hide category and tag text for pages on Search ?&gt;
</ins><span class="cx">                         &lt;?php
</span><span class="cx">                                 /* translators: used between list items, there is a space after the comma */
</span><span class="cx">                                 $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">                                 $show_sep = true; ?&gt;
</span><span class="cx">                         &lt;/span&gt;
</span><span class="cx">                         &lt;?php endif; // End if $tags_list ?&gt;
</span><del>-                        &lt;?php endif; // End if 'post' == $post-&gt;post_type ?&gt;
</del><ins>+                        &lt;?php endif; // End if 'post' == get_post_type() ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span><span class="cx">                         &lt;?php if ( $show_sep ) : ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -14,18 +14,13 @@
</span><span class="cx">  *
</span><span class="cx">  * @since Twenty Eleven 1.0
</span><span class="cx">  *
</span><del>- * @param string $hook_suffix The action passes the current page to the function. We don't
- *         do anything if we're not on our theme options page.
</del><span class="cx">  */
</span><span class="cx"> function twentyeleven_admin_enqueue_scripts( $hook_suffix ) {
</span><del>-        if ( $hook_suffix != 'appearance_page_theme_options' )
-                return;
-
</del><span class="cx">         wp_enqueue_style( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.css', false, '2011-04-28' );
</span><span class="cx">         wp_enqueue_script( 'twentyeleven-theme-options', get_template_directory_uri() . '/inc/theme-options.js', array( 'farbtastic' ), '2011-06-10' );
</span><span class="cx">         wp_enqueue_style( 'farbtastic' );
</span><span class="cx"> }
</span><del>-add_action( 'admin_enqueue_scripts', 'twentyeleven_admin_enqueue_scripts' );
</del><ins>+add_action( 'admin_print_styles-appearance_page_theme_options', 'twentyeleven_admin_enqueue_scripts' );
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Register the form setting for our twentyeleven_options array.
</span><span class="lines">@@ -309,7 +304,7 @@
</span><span class="cx"> 
</span><span class="cx">         // Link color must be 3 or 6 hexadecimal characters
</span><span class="cx">         if ( isset( $input['link_color'] ) &amp;&amp; preg_match( '/^#?([a-f0-9]{3}){1,2}$/i', $input['link_color'] ) )
</span><del>-                        $output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
</del><ins>+                $output['link_color'] = '#' . strtolower( ltrim( $input['link_color'], '#' ) );
</ins><span class="cx"> 
</span><span class="cx">         // Theme layout must be in our array of theme layout options
</span><span class="cx">         if ( isset( $input['theme_layout'] ) &amp;&amp; array_key_exists( $input['theme_layout'], twentyeleven_layouts() ) )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/single.php (18252 => 18253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/single.php        2011-06-10 22:55:28 UTC (rev 18252)
+++ trunk/wp-content/themes/twentyeleven/single.php        2011-06-10 23:01:16 UTC (rev 18253)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">                 &lt;div id=&quot;primary&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;content&quot; role=&quot;main&quot;&gt;
</span><span class="cx"> 
</span><del>-                                &lt;?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?&gt;
</del><ins>+                                &lt;?php while ( have_posts() ) : the_post(); ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                         &lt;nav id=&quot;nav-single&quot;&gt;
</span><span class="cx">                                                 &lt;h1 class=&quot;assistive-text&quot;&gt;&lt;?php _e( 'Post navigation', 'twentyeleven' ); ?&gt;&lt;/h1&gt;
</span></span></pre>
</div>
</div>

</body>
</html>