<!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>[17714] trunk/wp-content/themes/twentyeleven: Twenty Eleven:
  strip trailing spaces, props kawauso - see #17198</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17714">17714</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2011-04-26 18:34:52 +0000 (Tue, 26 Apr 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Twenty Eleven: strip trailing spaces, props kawauso - see <a href="http://trac.wordpress.org/ticket/17198">#17198</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyelevenauthorphp">trunk/wp-content/themes/twentyeleven/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentgalleryphp">trunk/wp-content/themes/twentyeleven/content-gallery.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentlinkphp">trunk/wp-content/themes/twentyeleven/content-link.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentsinglephp">trunk/wp-content/themes/twentyeleven/content-single.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevencontentphp">trunk/wp-content/themes/twentyeleven/content.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenfooterphp">trunk/wp-content/themes/twentyeleven/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenfunctionsphp">trunk/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenheaderphp">trunk/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenimagephp">trunk/wp-content/themes/twentyeleven/image.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenshowcasephp">trunk/wp-content/themes/twentyeleven/showcase.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevensidebarphp">trunk/wp-content/themes/twentyeleven/sidebar.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenwidgetsphp">trunk/wp-content/themes/twentyeleven/widgets.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyelevenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/author.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/author.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/author.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">                                                 &lt;?php the_author_meta( 'description' ); ?&gt;
</span><span class="cx">                                         &lt;/div&gt;&lt;!-- #author-description        --&gt;
</span><span class="cx">                                 &lt;/div&gt;&lt;!-- #entry-author-info --&gt;
</span><del>-                                &lt;?php endif; ?&gt;                                                                
</del><ins>+                                &lt;?php endif; ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                 &lt;?php /* Start the Loop */ ?&gt;
</span><span class="cx">                                 &lt;?php while ( have_posts() ) : the_post(); ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentgalleryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-gallery.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-gallery.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/content-gallery.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">         &lt;div class=&quot;entry-content&quot;&gt;
</span><span class="cx">                 &lt;?php if ( post_password_required() ) : ?&gt;
</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><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php else : ?&gt;
</span><span class="cx">                                 &lt;?php
</span><span class="cx">                                         $images = get_children( array( 'post_parent' =&gt; $post-&gt;ID, 'post_type' =&gt; 'attachment', 'post_mime_type' =&gt; 'image', 'orderby' =&gt; 'menu_order', 'order' =&gt; 'ASC', 'numberposts' =&gt; 999 ) );
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx">                                 &lt;figure class=&quot;gallery-thumb&quot;&gt;
</span><span class="cx">                                         &lt;a href=&quot;&lt;?php the_permalink(); ?&gt;&quot;&gt;&lt;?php echo $image_img_tag; ?&gt;&lt;/a&gt;
</span><span class="cx">                                 &lt;/figure&gt;&lt;!-- .gallery-thumb --&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;p&gt;&lt;em&gt;&lt;?php printf( _n( 'This gallery contains &lt;a %1$s&gt;%2$s photo&lt;/a&gt;.', 'This gallery contains &lt;a %1$s&gt;%2$s photos&lt;/a&gt;.', $total_images, 'twentyeleven' ),
</span><span class="cx">                                                 'href=&quot;' . get_permalink() . '&quot; title=&quot;' . sprintf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) . '&quot; rel=&quot;bookmark&quot;',
</span><span class="cx">                                                 number_format_i18n( $total_images )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-link.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-link.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/content-link.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php if ( 'post' == $post-&gt;post_type ) : ?&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span><span class="cx">                         &lt;div class=&quot;comments-link&quot;&gt;
</span><span class="cx">                                 &lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Reply&lt;/span&gt;', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentsinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content-single.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content-single.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/content-single.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">                 &lt;?php wp_link_pages( array( 'before' =&gt; '&lt;div class=&quot;page-link&quot;&gt;' . __( '&lt;span&gt;Pages:&lt;/span&gt;', 'twentyeleven' ), 'after' =&gt; '&lt;/div&gt;' ) ); ?&gt;
</span><span class="cx">         &lt;/div&gt;&lt;!-- .entry-content --&gt;
</span><span class="cx"> 
</span><del>-        &lt;footer class=&quot;entry-meta&quot;&gt;                
</del><ins>+        &lt;footer class=&quot;entry-meta&quot;&gt;
</ins><span class="cx">                 &lt;?php
</span><span class="cx">                         $tag_list = get_the_tag_list( '', ', ' );
</span><span class="cx">                         if ( '' != $tag_list ) {
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">                         );
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;?php edit_post_link( __( 'Edit', 'twentyeleven' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 &lt;?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?&gt;
</span><span class="cx">                 &lt;div id=&quot;author-info&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;author-avatar&quot;&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevencontentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/content.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/content.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/content.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">                                 ?&gt;
</span><span class="cx">                         &lt;/div&gt;&lt;!-- .entry-meta --&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span><span class="cx">                         &lt;div class=&quot;comments-link&quot;&gt;
</span><span class="cx">                                 &lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Reply&lt;/span&gt;', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?&gt;
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx">                         &lt;span class=&quot;cat-links&quot;&gt;&lt;span class=&quot;entry-utility-prep entry-utility-prep-cat-links&quot;&gt;&lt;?php _e( 'Posted in ', 'twentyeleven' ); ?&gt;&lt;/span&gt;&lt;?php the_category( ', ' ); ?&gt;&lt;/span&gt;
</span><span class="cx">                         &lt;?php the_tags( '&lt;span class=&quot;sep&quot;&gt; | &lt;/span&gt;&lt;span class=&quot;tag-links&quot;&gt;' . __( 'Tagged ', 'twentyeleven' ) . '&lt;/span&gt;', ', ', '' ); ?&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php if ( comments_open() ) : ?&gt;
</span><span class="cx">                         &lt;span class=&quot;sep&quot;&gt; | &lt;/span&gt;
</span><span class="cx">                         &lt;span class=&quot;comments-link&quot;&gt;&lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Leave a reply&lt;/span&gt;', 'twentyeleven' ), __( '&lt;b&gt;1&lt;/b&gt; Reply', 'twentyeleven' ), __( '&lt;b&gt;%&lt;/b&gt; Replies', 'twentyeleven' ) ); ?&gt;&lt;/span&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php edit_post_link( __( 'Edit', 'twentyeleven' ), '&lt;span class=&quot;edit-link&quot;&gt;', '&lt;/span&gt;' ); ?&gt;
</span><span class="cx">                 &lt;/footer&gt;&lt;!-- #entry-meta --&gt;
</span><span class="cx">         &lt;/article&gt;&lt;!-- #post-&lt;?php the_ID(); ?&gt; --&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/footer.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/footer.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/footer.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -8,29 +8,29 @@
</span><span class="cx">         &lt;/div&gt;&lt;!-- #main --&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;footer id=&quot;colophon&quot; role=&quot;contentinfo&quot;&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                         &lt;?php if ( is_active_sidebar( 'sidebar-3' ) || is_active_sidebar( 'sidebar-4' ) || is_active_sidebar( 'sidebar-5' ) ) : ?&gt;
</span><span class="cx">                         &lt;div id=&quot;supplementary&quot; &lt;?php twentyeleven_footer_sidebar_class(); ?&gt;&gt;
</span><span class="cx">                                 &lt;?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?&gt;
</span><span class="cx">                                 &lt;div id=&quot;first&quot; class=&quot;widget-area&quot; role=&quot;complementary&quot;&gt;
</span><span class="cx">                                         &lt;?php dynamic_sidebar( 'sidebar-3' ); ?&gt;
</span><span class="cx">                                 &lt;/div&gt;&lt;!-- #first .widget-area --&gt;
</span><del>-                                &lt;?php endif; ?&gt;                                
</del><ins>+                                &lt;?php endif; ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                 &lt;?php if ( is_active_sidebar( 'sidebar-4' ) ) : ?&gt;
</span><span class="cx">                                 &lt;div id=&quot;second&quot; class=&quot;widget-area&quot; role=&quot;complementary&quot;&gt;
</span><span class="cx">                                         &lt;?php dynamic_sidebar( 'sidebar-4' ); ?&gt;
</span><span class="cx">                                 &lt;/div&gt;&lt;!-- #second .widget-area --&gt;
</span><del>-                                &lt;?php endif; ?&gt;                                
</del><ins>+                                &lt;?php endif; ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                 &lt;?php if ( is_active_sidebar( 'sidebar-5' ) ) : ?&gt;
</span><span class="cx">                                 &lt;div id=&quot;third&quot; class=&quot;widget-area&quot; role=&quot;complementary&quot;&gt;
</span><span class="cx">                                         &lt;?php dynamic_sidebar( 'sidebar-5' ); ?&gt;
</span><span class="cx">                                 &lt;/div&gt;&lt;!-- #third .widget-area --&gt;
</span><del>-                                &lt;?php endif; ?&gt;                                
</del><ins>+                                &lt;?php endif; ?&gt;
</ins><span class="cx">                         &lt;/div&gt;&lt;!-- #supplementary --&gt;
</span><span class="cx">                         &lt;?php endif; ?&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                         &lt;div id=&quot;site-generator&quot;&gt;
</span><span class="cx">                                 &lt;a href=&quot;http://wordpress.org/&quot; rel=&quot;generator&quot;&gt;Proudly powered by WordPress&lt;/a&gt;&lt;span class=&quot;sep&quot;&gt; | &lt;/span&gt;&lt;?php printf( __( 'Theme: %1$s.', 'twentyeleven' ), 'Twenty Eleven' ); ?&gt;
</span><span class="cx">                         &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/functions.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/functions.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/functions.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">                 'before_title' =&gt; '&lt;h1 class=&quot;widget-title&quot;&gt;',
</span><span class="cx">                 'after_title' =&gt; '&lt;/h1&gt;',
</span><span class="cx">         ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">         register_sidebar( array(
</span><span class="cx">                 'name' =&gt; __( 'Footer Area Two', 'twentyeleven' ),
</span><span class="cx">                 'id' =&gt; 'sidebar-4',
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx">                 'before_title' =&gt; '&lt;h1 class=&quot;widget-title&quot;&gt;',
</span><span class="cx">                 'after_title' =&gt; '&lt;/h1&gt;',
</span><span class="cx">         ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">         register_sidebar( array(
</span><span class="cx">                 'name' =&gt; __( 'Footer Area Three', 'twentyeleven' ),
</span><span class="cx">                 'id' =&gt; 'sidebar-5',
</span><span class="lines">@@ -305,7 +305,6 @@
</span><span class="cx">                 'before_title' =&gt; '&lt;h1 class=&quot;widget-title&quot;&gt;',
</span><span class="cx">                 'after_title' =&gt; '&lt;/h1&gt;',
</span><span class="cx">         ) );
</span><del>-        
</del><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'twentyeleven_widgets_init' );
</span><span class="cx"> 
</span><span class="lines">@@ -355,7 +354,7 @@
</span><span class="cx">  */
</span><span class="cx"> function twentyeleven_footer_sidebar_class() {
</span><span class="cx">         $count = 0;
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( is_active_sidebar( 'sidebar-3' ) )
</span><span class="cx">                 $count++;
</span><span class="cx"> 
</span><span class="lines">@@ -364,7 +363,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( is_active_sidebar( 'sidebar-5' ) )
</span><span class="cx">                 $count++;
</span><del>-                
</del><ins>+
</ins><span class="cx">         switch ( $count ) {
</span><span class="cx">                 case '1':
</span><span class="cx">                         $class = 'one';
</span><span class="lines">@@ -377,12 +376,12 @@
</span><span class="cx">                 case '3':
</span><span class="cx">                         $class = 'three';
</span><span class="cx">                         break;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 default:
</span><span class="cx">                         $class = '';
</span><span class="cx">                         break;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( '' != $class )
</span><span class="cx">                 echo 'class=&quot;' . $class . '&quot;';
</span><span class="cx"> }
</span><span class="lines">@@ -411,19 +410,19 @@
</span><span class="cx">                                                 $avatar_size = 68;
</span><span class="cx">                                                 if ( '0' != $comment-&gt;comment_parent )
</span><span class="cx">                                                         $avatar_size = 39;
</span><del>-                                                        
</del><ins>+
</ins><span class="cx">                                                 echo get_avatar( $comment, $avatar_size );
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                                 printf( __( '%1$s on %2$s%3$s at %4$s%5$s &lt;span class=&quot;says&quot;&gt;said:&lt;/span&gt;', 'twentyeleven' ),
</span><span class="cx">                                                         sprintf( '&lt;cite class=&quot;fn&quot;&gt;%s&lt;/cite&gt;', get_comment_author_link() ),
</span><span class="cx">                                                         '&lt;a href=&quot;' . esc_url( get_comment_link( $comment-&gt;comment_ID ) ) . '&quot;&gt;&lt;time pubdate datetime=&quot;' . get_comment_time( 'c' ) . '&quot;&gt;',
</span><span class="cx">                                                         get_comment_date(),
</span><span class="cx">                                                         get_comment_time(),
</span><del>-                                                        '&lt;/time&gt;&lt;/a&gt;'                                                        
</del><ins>+                                                        '&lt;/time&gt;&lt;/a&gt;'
</ins><span class="cx">                                                 );
</span><span class="cx">                                         ?&gt;
</span><del>-                                        
-                                        &lt;?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?&gt;                                        
</del><ins>+
+                                        &lt;?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?&gt;
</ins><span class="cx">                                 &lt;/div&gt;&lt;!-- .comment-author .vcard --&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;?php if ( $comment-&gt;comment_approved == '0' ) : ?&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/header.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/header.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/header.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">                                 &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;
</span><span class="cx">                                 &lt;h2 id=&quot;site-description&quot;&gt;&lt;?php bloginfo( 'description' ); ?&gt;&lt;/h2&gt;
</span><span class="cx">                         &lt;/hgroup&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php
</span><span class="cx">                                 // Check to see if the header image has been removed
</span><span class="cx">                                 if ( get_header_image() != '' ) :
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/image.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/image.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/image.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -10,11 +10,11 @@
</span><span class="cx">                         &lt;div id=&quot;content&quot; role=&quot;main&quot;&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php the_post(); ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;nav id=&quot;nav-single&quot;&gt;
</span><span class="cx">                                 &lt;span class=&quot;nav-previous&quot;&gt;&lt;?php previous_image_link( false, __( '&amp;larr; Previous' , 'twentyeleven' ) ); ?&gt;&lt;/span&gt;
</span><span class="cx">                                 &lt;span class=&quot;nav-next&quot;&gt;&lt;?php next_image_link( false, __( 'Next &amp;rarr;' , 'twentyeleven' ) ); ?&gt;&lt;/span&gt;
</span><del>-                        &lt;/nav&gt;&lt;!-- #nav-single --&gt;                        
</del><ins>+                        &lt;/nav&gt;&lt;!-- #nav-single --&gt;
</ins><span class="cx"> 
</span><span class="cx">                                 &lt;article id=&quot;post-&lt;?php the_ID(); ?&gt;&quot; &lt;?php post_class(); ?&gt;&gt;
</span><span class="cx">                                         &lt;header class=&quot;entry-header&quot;&gt;
</span><span class="lines">@@ -70,12 +70,12 @@
</span><span class="cx">                                                                 $attachment_size = apply_filters( 'theme_attachment_size', 848 );
</span><span class="cx">                                                                 echo wp_get_attachment_image( $post-&gt;ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
</span><span class="cx">                                                                 ?&gt;&lt;/a&gt;
</span><del>-                                                                
</del><ins>+
</ins><span class="cx">                                                                 &lt;?php if ( ! empty( $post-&gt;post_excerpt ) ) : ?&gt;
</span><span class="cx">                                                                 &lt;div class=&quot;entry-caption&quot;&gt;
</span><span class="cx">                                                                         &lt;?php the_excerpt(); ?&gt;
</span><span class="cx">                                                                 &lt;/div&gt;
</span><del>-                                                                &lt;?php endif; ?&gt;                                                                
</del><ins>+                                                                &lt;?php endif; ?&gt;
</ins><span class="cx">                                                         &lt;/div&gt;&lt;!-- .attachment --&gt;
</span><span class="cx"> 
</span><span class="cx">                                                 &lt;/div&gt;&lt;!-- .entry-attachment --&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenshowcasephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/showcase.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/showcase.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/showcase.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -11,15 +11,15 @@
</span><span class="cx"> 
</span><span class="cx">                 &lt;div id=&quot;primary&quot; class=&quot;showcase&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;content&quot; role=&quot;main&quot;&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;?php the_post(); ?&gt;
</span><del>-                                                        
</del><ins>+
</ins><span class="cx">                                 &lt;?php
</span><span class="cx">                                         // If we have content for this page, let's display it.
</span><span class="cx">                                         if ( '' != get_the_content() )
</span><span class="cx">                                                 get_template_part( 'content', 'intro' );
</span><span class="cx">                                 ?&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;?php
</span><span class="cx">                                         // See if we have any sticky posts and use the latest to create a featured post
</span><span class="cx">                                         $sticky = get_option( 'sticky_posts' );
</span><span class="lines">@@ -27,15 +27,15 @@
</span><span class="cx">                                                 'posts_per_page' =&gt; 1,
</span><span class="cx">                                                 'post__in' =&gt; $sticky,
</span><span class="cx">                                         );
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         $featured = new WP_Query();
</span><span class="cx">                                         $featured-&gt;query( $featured_args );
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                         // Let's roll.
</span><span class="cx">                                         if ( $sticky ) :
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         $featured-&gt;the_post();
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // We're going to add a class to our featured post for featured images
</span><span class="cx">                                         // by default it'll have no class though
</span><span class="cx">                                         $feature_class = '';
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">                                                 }
</span><span class="cx">                                         }
</span><span class="cx">                                         ?&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;?php if ( has_post_thumbnail() ) : ?&gt;
</span><span class="cx">                                 &lt;section class=&quot;featured-post &lt;?php echo $feature_class; ?&gt;&quot;&gt;
</span><span class="cx">                                 &lt;?php else : ?&gt;
</span><span class="lines">@@ -69,15 +69,15 @@
</span><span class="cx">                                                         &lt;?php } else { ?&gt;
</span><span class="cx">                                                                 &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_post_thumbnail( 'small-feature' ); ?&gt;&lt;/a&gt;
</span><span class="cx">                                                         &lt;?php }
</span><del>-                                                }                                        
-                                        ?&gt;                                        
</del><ins>+                                                }
+                                        ?&gt;
</ins><span class="cx">                                         &lt;?php get_template_part( 'content', 'featured' ); ?&gt;
</span><del>-                                &lt;/section&gt;                                                        
</del><ins>+                                &lt;/section&gt;
</ins><span class="cx">                                 &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="cx">                                 &lt;section class=&quot;recent-posts&quot;&gt;
</span><span class="cx">                                         &lt;h1 class=&quot;showcase-heading&quot;&gt;&lt;?php _e( 'Recent Posts', 'twentyeleven' ); ?&gt;&lt;/h1&gt;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         &lt;?php
</span><span class="cx"> 
</span><span class="cx">                                         // Display our recent posts, showing full content for the very latest, ignoring Aside posts
</span><span class="lines">@@ -96,17 +96,17 @@
</span><span class="cx">                                         $recent = new WP_Query();
</span><span class="cx">                                         $recent-&gt;query( $recent_args );
</span><span class="cx">                                         $counter = 0;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         while ( $recent-&gt;have_posts() ) : $recent-&gt;the_post();
</span><span class="cx">                                                 // set $more to 0 in order to only get the first part of the post
</span><span class="cx">                                                 global $more;
</span><del>-                                                $more = 0;                                        
</del><ins>+                                                $more = 0;
</ins><span class="cx">                                                 $counter++;
</span><del>-                                                
</del><ins>+
</ins><span class="cx">                                                 if ( 1 == $counter ) :
</span><span class="cx">                                                         get_template_part( 'content', get_post_format() );
</span><span class="cx">                                                         echo '&lt;ol class=&quot;other-recent-posts&quot;&gt;';
</span><del>-                                                        
</del><ins>+
</ins><span class="cx">                                                 else : ?&gt;
</span><span class="cx">                                                         &lt;li class=&quot;entry-title&quot;&gt;
</span><span class="cx">                                                                 &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;
</span><span class="lines">@@ -114,20 +114,20 @@
</span><span class="cx">                                                                         &lt;?php comments_popup_link( __( '&lt;span class=&quot;leave-reply&quot;&gt;Leave a reply&lt;/span&gt;', 'twentyeleven' ), __( '&lt;b&gt;1&lt;/b&gt; Reply', 'twentyeleven' ), __( '&lt;b&gt;%&lt;/b&gt; Replies', 'twentyeleven' ) ); ?&gt;
</span><span class="cx">                                                                 &lt;/span&gt;
</span><span class="cx">                                                         &lt;/li&gt;
</span><del>-                                                        
</del><ins>+
</ins><span class="cx">                                                 &lt;?php endif;
</span><span class="cx">                                         endwhile;
</span><span class="cx">                                         ?&gt;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         &lt;/ol&gt;
</span><span class="cx">                                 &lt;/section&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;div class=&quot;widget-area&quot; role=&quot;complementary&quot;&gt;
</span><span class="cx">                                         &lt;?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?&gt;
</span><del>-                                                
</del><ins>+
</ins><span class="cx">                                                 &lt;?php
</span><span class="cx">                                                 the_widget( 'Twenty_Eleven_Ephemera_Widget', '', 'before_title=&lt;h1 class=&quot;widget-title&quot;&gt;&amp;after_title=&lt;/h1&gt;' );
</span><del>-                                                ?&gt;                                                
</del><ins>+                                                ?&gt;
</ins><span class="cx"> 
</span><span class="cx">                                         &lt;?php endif; // end sidebar widget area ?&gt;
</span><span class="cx">                                 &lt;/div&gt;&lt;!-- .widget-area --&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/sidebar.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/sidebar.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/sidebar.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -25,4 +25,3 @@
</span><span class="cx"> 
</span><span class="cx">                         &lt;?php endif; // end sidebar widget area ?&gt;
</span><span class="cx">                 &lt;/div&gt;&lt;!-- #secondary .widget-area --&gt;
</span><del>-                
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/widgets.php (17713 => 17714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/widgets.php        2011-04-26 18:30:48 UTC (rev 17713)
+++ trunk/wp-content/themes/twentyeleven/widgets.php        2011-04-26 18:34:52 UTC (rev 17714)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">  * @see http://codex.wordpress.org/Widgets_API#Developing_Widgets
</span><span class="cx">  */
</span><span class="cx"> class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
</span><del>-        
</del><ins>+
</ins><span class="cx">         /**
</span><span class="cx">          * Constructor
</span><span class="cx">          *
</span><span class="lines">@@ -15,18 +15,18 @@
</span><span class="cx">                 $widget_ops = array( 'classname' =&gt; 'widget_twentyeleven_ephemera', 'description' =&gt; __( 'Use this widget to list your recent Aside and Link posts', 'twentyeleven' ) );
</span><span class="cx">                 $this-&gt;WP_Widget( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), $widget_ops );
</span><span class="cx">                 $this-&gt;alt_option_name = 'widget_twentyeleven_ephemera';
</span><del>-                
</del><ins>+
</ins><span class="cx">                 add_action( 'save_post', array(&amp;$this, 'flush_widget_cache' ) );
</span><span class="cx">                 add_action( 'deleted_post', array(&amp;$this, 'flush_widget_cache' ) );
</span><span class="cx">                 add_action( 'switch_theme', array(&amp;$this, 'flush_widget_cache' ) );
</span><del>-                
</del><ins>+
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         /**
</span><span class="cx">          * Outputs the HTML for this widget.
</span><span class="cx">          *
</span><del>-         * @param array An array of standard parameters for widgets in this theme 
-         * @param array An array of settings for this widget instance 
</del><ins>+         * @param array An array of standard parameters for widgets in this theme
+         * @param array An array of settings for this widget instance
</ins><span class="cx">          * @return void Echoes it's output
</span><span class="cx">          **/
</span><span class="cx">         function widget( $args, $instance ) {
</span><span class="lines">@@ -43,14 +43,14 @@
</span><span class="cx">                         return;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                ob_start();                
</del><ins>+                ob_start();
</ins><span class="cx">                 extract( $args, EXTR_SKIP );
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Ephemera' ) : $instance['title'], $instance, $this-&gt;id_base);
</span><del>-                
</del><ins>+
</ins><span class="cx">                 if ( ! isset( $instance['number'] ) )
</span><span class="cx">                         $instance['number'] = '10';
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 if ( ! $number = absint( $instance['number'] ) )
</span><span class="cx">                          $number = 10;
</span><span class="cx"> 
</span><span class="lines">@@ -73,33 +73,33 @@
</span><span class="cx">                 $ephemera-&gt;query( $ephemera_args );
</span><span class="cx"> 
</span><span class="cx">                 if ( $ephemera-&gt;have_posts() ) :
</span><del>-                
</del><ins>+
</ins><span class="cx">                 echo $before_widget;
</span><span class="cx">                 echo $before_title;
</span><span class="cx">                 echo $title; // Can set this with a widget option, or omit altogether
</span><span class="cx">                 echo $after_title;
</span><span class="cx"> 
</span><span class="cx">                 global $post;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;ol&gt;
</span><span class="cx">                 &lt;?php while ( $ephemera-&gt;have_posts() ) : $ephemera-&gt;the_post(); ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php if ( 'aside' == get_post_format( $post-&gt;ID ) ) : ?&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                         &lt;li class=&quot;entry-title&quot;&gt;
</span><span class="cx">                                 &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;
</span><span class="cx">                                 &lt;span class=&quot;comments-link&quot;&gt;
</span><span class="cx">                                         &lt;?php comments_popup_link( __( '0 &lt;span class=&quot;reply&quot;&gt;comments &amp;rarr;&lt;/span&gt;', 'twentyeleven' ), __( '1 &lt;span class=&quot;reply&quot;&gt;comment &amp;rarr;&lt;/span&gt;', 'twentyeleven' ), __( '% &lt;span class=&quot;reply&quot;&gt;comments &amp;rarr;&lt;/span&gt;', 'twentyeleven' ) ); ?&gt;
</span><span class="cx">                                 &lt;/span&gt;
</span><span class="cx">                         &lt;/li&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php elseif ( 'link' == get_post_format( $post-&gt;ID ) ) : ?&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;li class=&quot;entry-title&quot;&gt;
</span><span class="cx">                                 &lt;?php
</span><span class="cx">                                         $link_url = get_permalink();
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         if ( false != twentyeleven_url_grabber() )
</span><span class="cx">                                                 $link_url = twentyeleven_url_grabber();
</span><span class="cx">                                 ?&gt;
</span><span class="lines">@@ -108,15 +108,15 @@
</span><span class="cx">                                         &lt;?php comments_popup_link( __( '0 &lt;span class=&quot;reply&quot;&gt;comments &amp;rarr;&lt;/span&gt;', 'twentyeleven' ), __( '1 &lt;span class=&quot;reply&quot;&gt;comment &amp;rarr;&lt;/span&gt;', 'twentyeleven' ), __( '% &lt;span class=&quot;reply&quot;&gt;comments &amp;rarr;&lt;/span&gt;', 'twentyeleven' ) ); ?&gt;
</span><span class="cx">                                 &lt;/span&gt;
</span><span class="cx">                         &lt;/li&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         &lt;?php endif; ?&gt;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 &lt;?php endwhile; ?&gt;
</span><span class="cx">                 &lt;/ol&gt;
</span><span class="cx">                 &lt;?php
</span><span class="cx"> 
</span><span class="cx">                 echo $after_widget;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 // Reset the global $the_post as this query will have stomped on it
</span><span class="cx">                 wp_reset_postdata();
</span><span class="cx"> 
</span><span class="lines">@@ -143,10 +143,10 @@
</span><span class="cx"> 
</span><span class="cx">                 return $instance;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         function flush_widget_cache() {
</span><span class="cx">                 wp_cache_delete( 'widget_twentyeleven_ephemera', 'widget' );
</span><del>-        }        
</del><ins>+        }
</ins><span class="cx"> 
</span><span class="cx">         /**
</span><span class="cx">          * Displays the form for this widget on the Widgets page of the WP Admin area.
</span></span></pre>
</div>
</div>

</body>
</html>