<!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>[14433] trunk/wp-content/themes/twentyten:
Twenty Ten spacing and string cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14433">14433</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-04 07:01:09 +0000 (Tue, 04 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Ten spacing and string cleanups. props zeo, markmcwilliams. see <a href="http://trac.wordpress.org/ticket/13198">#13198</a>. Add a twentyten_credits filter, props nathanrice, fixes <a href="http://trac.wordpress.org/ticket/12804">#12804</a>. Also clean up the generator/credits string.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencommentsphp">trunk/wp-content/themes/twentyten/comments.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfooterphp">trunk/wp-content/themes/twentyten/footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenfunctionsphp">trunk/wp-content/themes/twentyten/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenheaderphp">trunk/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensinglephp">trunk/wp-content/themes/twentyten/single.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
</span><span class="cx"> <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
</span><span class="cx"> <?php endif; ?>
</span><del>-<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins>+<?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
</ins><span class="cx"> </div><!-- .entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><span class="cx"> <h3 id="comments-title">
</span><span class="cx"> <?php
</span><del>- printf( _n('One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten'),
</del><ins>+ printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number(), 'twentyten' ),
</ins><span class="cx"> number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
</span><span class="cx"> ?>
</span><span class="cx"> </h3>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="site-generator">
</span><del>- <?php printf( __( 'Proudly powered by <span id="generator-link">%s</span>.', 'twentyten' ), '<a href="http://wordpress.org/" title="' . esc_attr__( 'Semantic Personal Publishing Platform', 'twentyten' ) . '" rel="generator">' . __( 'WordPress', 'twentyten' ) . '</a>' ); ?>
</del><ins>+ <?php do_action('twentyten_credits' ); ?>
+ <a href="http://wordpress.org/" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div><!-- #colophon -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -104,8 +104,8 @@
</span><span class="cx">
</span><span class="cx"> // The height and width of your custom header. You can hook into the theme's own filters to change these values.
</span><span class="cx"> // Add a filter to twentyten_header_image_width and twentyten_header_image_height to change these values.
</span><del>- define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) );
- define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
</del><ins>+ define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) );
+ define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
</ins><span class="cx">
</span><span class="cx"> // We'll be using post thumbnails for custom header images on posts and pages.
</span><span class="cx"> // We want them to be 940 pixels wide by 198 pixels tall (larger images will be auto-cropped to fit).
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> * @return string A pretty 'Continue reading' link.
</span><span class="cx"> */
</span><span class="cx"> function twentyten_excerpt_more( $more ) {
</span><del>- return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . __('Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten') . '</a>';
</del><ins>+ return ' &hellip; <a href="'. get_permalink() . '">' . __('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten') . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> add_filter( 'excerpt_more', 'twentyten_excerpt_more' );
</span><span class="cx">
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> <br />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),' ','' ); ?></div>
</del><ins>+ <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s', 'twentyten' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <div class="comment-body"><?php comment_text(); ?></div>
</span><span class="cx">
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <li class="post pingback">
</span><del>- <p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
</del><ins>+ <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link ( __('(Edit)', 'twentyten'), ' ' ); ?></p>
</ins><span class="cx"> <?php endif;
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="lines">@@ -294,9 +294,9 @@
</span><span class="cx"> function twentyten_widgets_init() {
</span><span class="cx"> // Area 1
</span><span class="cx"> register_sidebar( array (
</span><del>- 'name' => __( 'Primary Widget Area' , 'twentyten' ),
</del><ins>+ 'name' => __( 'Primary Widget Area', 'twentyten' ),
</ins><span class="cx"> 'id' => 'primary-widget-area',
</span><del>- 'description' => __( 'The primary widget area' , 'twentyten' ),
</del><ins>+ 'description' => __( 'The primary widget area', 'twentyten' ),
</ins><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -305,9 +305,9 @@
</span><span class="cx">
</span><span class="cx"> // Area 2
</span><span class="cx"> register_sidebar( array (
</span><del>- 'name' => __( 'Secondary Widget Area' , 'twentyten' ),
</del><ins>+ 'name' => __( 'Secondary Widget Area', 'twentyten' ),
</ins><span class="cx"> 'id' => 'secondary-widget-area',
</span><del>- 'description' => __( 'The secondary widget area' , 'twentyten' ),
</del><ins>+ 'description' => __( 'The secondary widget area', 'twentyten' ),
</ins><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -316,9 +316,9 @@
</span><span class="cx">
</span><span class="cx"> // Area 3
</span><span class="cx"> register_sidebar( array (
</span><del>- 'name' => __( 'First Footer Widget Area' , 'twentyten' ),
</del><ins>+ 'name' => __( 'First Footer Widget Area', 'twentyten' ),
</ins><span class="cx"> 'id' => 'first-footer-widget-area',
</span><del>- 'description' => __( 'The first footer widget area' , 'twentyten' ),
</del><ins>+ 'description' => __( 'The first footer widget area', 'twentyten' ),
</ins><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -327,9 +327,9 @@
</span><span class="cx">
</span><span class="cx"> // Area 4
</span><span class="cx"> register_sidebar( array (
</span><del>- 'name' => __( 'Second Footer Widget Area' , 'twentyten' ),
</del><ins>+ 'name' => __( 'Second Footer Widget Area', 'twentyten' ),
</ins><span class="cx"> 'id' => 'second-footer-widget-area',
</span><del>- 'description' => __( 'The second footer widget area' , 'twentyten' ),
</del><ins>+ 'description' => __( 'The second footer widget area', 'twentyten' ),
</ins><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -338,9 +338,9 @@
</span><span class="cx">
</span><span class="cx"> // Area 5
</span><span class="cx"> register_sidebar( array (
</span><del>- 'name' => __( 'Third Footer Widget Area' , 'twentyten' ),
</del><ins>+ 'name' => __( 'Third Footer Widget Area', 'twentyten' ),
</ins><span class="cx"> 'id' => 'third-footer-widget-area',
</span><del>- 'description' => __( 'The third footer widget area' , 'twentyten' ),
</del><ins>+ 'description' => __( 'The third footer widget area', 'twentyten' ),
</ins><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -349,9 +349,9 @@
</span><span class="cx">
</span><span class="cx"> // Area 6
</span><span class="cx"> register_sidebar( array (
</span><del>- 'name' => __( 'Fourth Footer Widget Area' , 'twentyten' ),
</del><ins>+ 'name' => __( 'Fourth Footer Widget Area', 'twentyten' ),
</ins><span class="cx"> 'id' => 'fourth-footer-widget-area',
</span><del>- 'description' => __( 'The fourth footer widget area' , 'twentyten' ),
</del><ins>+ 'description' => __( 'The fourth footer widget area', 'twentyten' ),
</ins><span class="cx"> 'before_widget' => '<li id="%1$s" class="widget-container %2$s">',
</span><span class="cx"> 'after_widget' => "</li>",
</span><span class="cx"> 'before_title' => '<h3 class="widget-title">',
</span><span class="lines">@@ -375,17 +375,15 @@
</span><span class="cx"> function twentyten_get_next_attachment_url() {
</span><span class="cx"> global $post;
</span><span class="cx"> $post = get_post($post);
</span><del>- $attachments = array_values(get_children( array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID') ));
</del><ins>+ $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
</ins><span class="cx">
</span><del>- foreach ( $attachments as $k => $attachment )
</del><ins>+ foreach ( $attachments as $k => $attachment ) {
</ins><span class="cx"> if ( $attachment->ID == $post->ID )
</span><span class="cx"> break;
</span><del>-
- $k = $k + 1;
-
- if ( isset($attachments[$k]) ) {
- return get_attachment_link($attachments[$k]->ID);
- } else {
- return get_permalink($post->post_parent);
- }
</del><ins>+ }
+ $k++;
+ if ( isset( $attachments[ $k ] ) )
+ return get_attachment_link( $attachments[ $k ]->ID );
+ else
+ return get_permalink( $post->post_parent );
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/header.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> // Check if this is a post or page, if it has a thumbnail, and if it's a big one
</span><del>- if ( is_singular() &&
</del><ins>+ if ( is_singular() &&
</ins><span class="cx"> has_post_thumbnail( $post->ID ) &&
</span><span class="cx"> ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail') ) &&
</span><span class="cx"> $image[1] >= HEADER_IMAGE_WIDTH ) :
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/index.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * The main template file
</span><span class="cx"> *
</span><span class="lines">@@ -13,7 +12,6 @@
</span><span class="cx"> * @subpackage Twenty Ten
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php get_header(); ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<?php /* Display navigation to next/previous pages when applicable */ ?>
</del><ins>+<?php /* Display navigation to next/previous pages when applicable */ ?>
</ins><span class="cx"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php /* If there are no posts to display, such as an empty archive page */ ?>
</del><ins>+<?php /* If there are no posts to display, such as an empty archive page */ ?>
</ins><span class="cx"> <?php if ( ! have_posts() ) : ?>
</span><span class="cx"> <div id="post-0" class="post error404 not-found">
</span><span class="cx"> <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
</span><span class="lines">@@ -32,10 +32,10 @@
</span><span class="cx"> </div><!-- #post-0 -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php /* Start the Loop */ ?>
</del><ins>+<?php /* Start the Loop */ ?>
</ins><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</span><del>-<?php /* How to Display posts in the Gallery Category */ ?>
</del><ins>+<?php /* How to Display posts in the Gallery Category */ ?>
</ins><span class="cx"> <?php if ( in_category( _x('gallery', 'gallery category slug', 'twentyten') ) ) : ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div class="entry-content">
</span><del>- <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</del><ins>+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php /* How to display all other posts */ ?>
</del><ins>+<?php /* How to display all other posts */ ?>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div class="entry-content">
</span><del>- <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</del><ins>+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</ins><span class="cx"> <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> <?php endif; // if different categories queried ?>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span><del>-<?php /* Display navigation to next/previous pages when applicable */ ?>
</del><ins>+<?php /* Display navigation to next/previous pages when applicable */ ?>
</ins><span class="cx"> <?php if ( $wp_query->max_num_pages > 1 ) : ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><span class="cx"> <div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' ) ); ?></div>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (14432 => 14433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-05-04 06:13:28 UTC (rev 14432)
+++ trunk/wp-content/themes/twentyten/single.php 2010-05-04 07:01:09 UTC (rev 14433)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
</span><del>- <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?> </span>
</del><ins>+ <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
</ins><span class="cx"> <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</span><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx"> <div id="entry-author-info">
</span><span class="cx"> <div id="author-avatar">
</span><span class="cx"> <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'twentyten_author_bio_avatar_size', 60 ) ); ?>
</span><del>- </div><!-- #author-avatar -->
</del><ins>+ </div><!-- #author-avatar -->
</ins><span class="cx"> <div id="author-description">
</span><span class="cx"> <h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
</span><span class="cx"> <?php the_author_meta( 'description' ); ?>
</span><span class="cx"> <div id="author-link">
</span><span class="cx"> <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
</span><span class="cx"> </div><!-- #author-link -->
</span><del>- </div><!-- #author-description -->
</del><ins>+ </div><!-- #author-description -->
</ins><span class="cx"> </div><!-- .entry-author-info -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>