<!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"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- #entry-author-info -->
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php /* Start the Loop */ ?>
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</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"> <div class="entry-content">
</span><span class="cx"> <?php if ( post_password_required() ) : ?>
</span><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <?php
</span><span class="cx"> $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> <figure class="gallery-thumb">
</span><span class="cx"> <a href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
</span><span class="cx"> </figure><!-- .gallery-thumb -->
</span><del>-
</del><ins>+
</ins><span class="cx"> <p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyeleven' ),
</span><span class="cx"> 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
</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"> <?php if ( 'post' == $post->post_type ) : ?>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><span class="cx"> <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</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"> <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( '<span>Pages:</span>', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><del>- <footer class="entry-meta">
</del><ins>+ <footer class="entry-meta">
</ins><span class="cx"> <?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"> ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
</span><span class="cx"> <div id="author-info">
</span><span class="cx"> <div id="author-avatar">
</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"> ?>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <div class="comments-link">
</span><span class="cx"> <?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
</span><span class="lines">@@ -47,12 +47,12 @@
</span><span class="cx"> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyeleven' ); ?></span><?php the_category( ', ' ); ?></span>
</span><span class="cx"> <?php the_tags( '<span class="sep"> | </span><span class="tag-links">' . __( 'Tagged ', 'twentyeleven' ) . '</span>', ', ', '' ); ?>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <span class="sep"> | </span>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </footer><!-- #entry-meta -->
</span><span class="cx"> </article><!-- #post-<?php the_ID(); ?> -->
</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"> </div><!-- #main -->
</span><span class="cx">
</span><span class="cx"> <footer id="colophon" role="contentinfo">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( is_active_sidebar( 'sidebar-3' ) || is_active_sidebar( 'sidebar-4' ) || is_active_sidebar( 'sidebar-5' ) ) : ?>
</span><span class="cx"> <div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>
</span><span class="cx"> <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
</span><span class="cx"> <div id="first" class="widget-area" role="complementary">
</span><span class="cx"> <?php dynamic_sidebar( 'sidebar-3' ); ?>
</span><span class="cx"> </div><!-- #first .widget-area -->
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_active_sidebar( 'sidebar-4' ) ) : ?>
</span><span class="cx"> <div id="second" class="widget-area" role="complementary">
</span><span class="cx"> <?php dynamic_sidebar( 'sidebar-4' ); ?>
</span><span class="cx"> </div><!-- #second .widget-area -->
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_active_sidebar( 'sidebar-5' ) ) : ?>
</span><span class="cx"> <div id="third" class="widget-area" role="complementary">
</span><span class="cx"> <?php dynamic_sidebar( 'sidebar-5' ); ?>
</span><span class="cx"> </div><!-- #third .widget-area -->
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> </div><!-- #supplementary -->
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div id="site-generator">
</span><span class="cx"> <a href="http://wordpress.org/" rel="generator">Proudly powered by WordPress</a><span class="sep"> | </span><?php printf( __( 'Theme: %1$s.', 'twentyeleven' ), 'Twenty Eleven' ); ?>
</span><span class="cx"> </div>
</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' => '<h1 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h1>',
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Footer Area Two', 'twentyeleven' ),
</span><span class="cx"> 'id' => 'sidebar-4',
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> 'before_title' => '<h1 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h1>',
</span><span class="cx"> ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> register_sidebar( array(
</span><span class="cx"> 'name' => __( 'Footer Area Three', 'twentyeleven' ),
</span><span class="cx"> 'id' => 'sidebar-5',
</span><span class="lines">@@ -305,7 +305,6 @@
</span><span class="cx"> 'before_title' => '<h1 class="widget-title">',
</span><span class="cx"> 'after_title' => '</h1>',
</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="' . $class . '"';
</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->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 <span class="says">said:</span>', 'twentyeleven' ),
</span><span class="cx"> sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ),
</span><span class="cx"> '<a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '"><time pubdate datetime="' . get_comment_time( 'c' ) . '">',
</span><span class="cx"> get_comment_date(),
</span><span class="cx"> get_comment_time(),
</span><del>- '</time></a>'
</del><ins>+ '</time></a>'
</ins><span class="cx"> );
</span><span class="cx"> ?>
</span><del>-
- <?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
</del><ins>+
+ <?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
</ins><span class="cx"> </div><!-- .comment-author .vcard -->
</span><span class="cx">
</span><span class="cx"> <?php if ( $comment->comment_approved == '0' ) : ?>
</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"> <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><span class="cx"> <h2 id="site-description"><?php bloginfo( 'description' ); ?></h2>
</span><span class="cx"> </hgroup>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?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"> <div id="content" role="main">
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <nav id="nav-single">
</span><span class="cx"> <span class="nav-previous"><?php previous_image_link( false, __( '&larr; Previous' , 'twentyeleven' ) ); ?></span>
</span><span class="cx"> <span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span>
</span><del>- </nav><!-- #nav-single -->
</del><ins>+ </nav><!-- #nav-single -->
</ins><span class="cx">
</span><span class="cx"> <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <header class="entry-header">
</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->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
</span><span class="cx"> ?></a>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( ! empty( $post->post_excerpt ) ) : ?>
</span><span class="cx"> <div class="entry-caption">
</span><span class="cx"> <?php the_excerpt(); ?>
</span><span class="cx"> </div>
</span><del>- <?php endif; ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> </div><!-- .attachment -->
</span><span class="cx">
</span><span class="cx"> </div><!-- .entry-attachment -->
</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"> <div id="primary" class="showcase">
</span><span class="cx"> <div id="content" role="main">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php the_post(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?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"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?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' => 1,
</span><span class="cx"> 'post__in' => $sticky,
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> $featured = new WP_Query();
</span><span class="cx"> $featured->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->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"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( has_post_thumbnail() ) : ?>
</span><span class="cx"> <section class="featured-post <?php echo $feature_class; ?>">
</span><span class="cx"> <?php else : ?>
</span><span class="lines">@@ -69,15 +69,15 @@
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_post_thumbnail( 'small-feature' ); ?></a>
</span><span class="cx"> <?php }
</span><del>- }
- ?>
</del><ins>+ }
+ ?>
</ins><span class="cx"> <?php get_template_part( 'content', 'featured' ); ?>
</span><del>- </section>
</del><ins>+ </section>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <section class="recent-posts">
</span><span class="cx"> <h1 class="showcase-heading"><?php _e( 'Recent Posts', 'twentyeleven' ); ?></h1>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?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->query( $recent_args );
</span><span class="cx"> $counter = 0;
</span><del>-
</del><ins>+
</ins><span class="cx"> while ( $recent->have_posts() ) : $recent->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 '<ol class="other-recent-posts">';
</span><del>-
</del><ins>+
</ins><span class="cx"> else : ?>
</span><span class="cx"> <li class="entry-title">
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
</span><span class="lines">@@ -114,20 +114,20 @@
</span><span class="cx"> <?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
</span><span class="cx"> </span>
</span><span class="cx"> </li>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php endif;
</span><span class="cx"> endwhile;
</span><span class="cx"> ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> </ol>
</span><span class="cx"> </section>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="widget-area" role="complementary">
</span><span class="cx"> <?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> the_widget( 'Twenty_Eleven_Ephemera_Widget', '', 'before_title=<h1 class="widget-title">&after_title=</h1>' );
</span><del>- ?>
</del><ins>+ ?>
</ins><span class="cx">
</span><span class="cx"> <?php endif; // end sidebar widget area ?>
</span><span class="cx"> </div><!-- .widget-area -->
</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"> <?php endif; // end sidebar widget area ?>
</span><span class="cx"> </div><!-- #secondary .widget-area -->
</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' => 'widget_twentyeleven_ephemera', 'description' => __( 'Use this widget to list your recent Aside and Link posts', 'twentyeleven' ) );
</span><span class="cx"> $this->WP_Widget( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), $widget_ops );
</span><span class="cx"> $this->alt_option_name = 'widget_twentyeleven_ephemera';
</span><del>-
</del><ins>+
</ins><span class="cx"> add_action( 'save_post', array(&$this, 'flush_widget_cache' ) );
</span><span class="cx"> add_action( 'deleted_post', array(&$this, 'flush_widget_cache' ) );
</span><span class="cx"> add_action( 'switch_theme', array(&$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->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->query( $ephemera_args );
</span><span class="cx">
</span><span class="cx"> if ( $ephemera->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"> ?>
</span><span class="cx"> <ol>
</span><span class="cx"> <?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( 'aside' == get_post_format( $post->ID ) ) : ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <li class="entry-title">
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
</span><span class="cx"> <span class="comments-link">
</span><span class="cx"> <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
</span><span class="cx"> </span>
</span><span class="cx"> </li>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php elseif ( 'link' == get_post_format( $post->ID ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <li class="entry-title">
</span><span class="cx"> <?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"> ?>
</span><span class="lines">@@ -108,15 +108,15 @@
</span><span class="cx"> <?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
</span><span class="cx"> </span>
</span><span class="cx"> </li>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php endwhile; ?>
</span><span class="cx"> </ol>
</span><span class="cx"> <?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>