<!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>[13128] trunk/wp-content/themes/twentyten: Formatting,
Translations & Whitespace.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13128">13128</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-14 01:00:22 +0000 (Sun, 14 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Formatting, Translations & Whitespace. Props ptahdunbar. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentyten404php">trunk/wp-content/themes/twentyten/404.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenarchivephp">trunk/wp-content/themes/twentyten/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenattachmentphp">trunk/wp-content/themes/twentyten/attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenauthorphp">trunk/wp-content/themes/twentyten/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.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="#trunkwpcontentthemestwentytenpagephp">trunk/wp-content/themes/twentyten/page.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchphp">trunk/wp-content/themes/twentyten/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchformphp">trunk/wp-content/themes/twentyten/searchform.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensidebarfooterphp">trunk/wp-content/themes/twentyten/sidebar-footer.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensidebarphp">trunk/wp-content/themes/twentyten/sidebar.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensinglephp">trunk/wp-content/themes/twentyten/single.php</a></li>
<li><a href="#trunkwpcontentthemestwentytentagphp">trunk/wp-content/themes/twentyten/tag.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentyten404php"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/404.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/404.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/404.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><span class="cx"> <div id="post-0" class="post error404 not-found">
</span><del>- <h1 class="entry-title">Not Found</h1>
</del><ins>+ <h1 class="entry-title"><?php _e( 'Not Found', 'twentyten' ); ?></h1>
</ins><span class="cx"> <div class="entry-content">
</span><del>- <p>Apologies, but the page you requested could not be found. Perhaps searching will help.</p>
</del><ins>+ <p><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'twentyten' ); ?></p>
</ins><span class="cx"> <?php get_search_form(); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div><!-- #post-0 -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/archive.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -6,21 +6,21 @@
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_day() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ) ?></h1>
</del><ins>+ <h1 class="page-title"><?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?></h1>
</ins><span class="cx"> <?php elseif ( is_month() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ) ?></h1>
</del><ins>+ <h1 class="page-title"><?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?></h1>
</ins><span class="cx"> <?php elseif ( is_year() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ) ?></h1>
</del><ins>+ <h1 class="page-title"><?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?></h1>
</ins><span class="cx"> <?php elseif ( isset($_GET['paged']) && !empty($_GET['paged']) ) : ?>
</span><del>- <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ) ?></h1>
</del><ins>+ <h1 class="page-title"><?php _e( 'Blog Archives', 'twentyten' ); ?></h1>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -31,10 +31,9 @@
</span><span class="cx">
</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><del>- <a href="<?php
- the_permalink(); ?>" title="<?php echo esc_attr( get_the_time('Y-m-d\TH:i:sO') ); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( get_the_time() ); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span><span class="lines">@@ -43,10 +42,10 @@
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
</span><del>- <span class="meta-sep"> | </span>
- <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
+ <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="lines">@@ -54,8 +53,8 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -5,18 +5,18 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <p class="page-title"><a href="<?php echo get_permalink($post->post_parent) ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title($post->post_parent), 1 ) ) ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent) ?></a></p>
</del><ins>+ <p class="page-title"><a href="<?php echo get_permalink($post->post_parent); ?>" title="<?php printf( esc_attr__( 'Return to %s', 'twentyten' ), esc_html( get_the_title($post->post_parent), 1 ) ); ?>" rel="gallery">&larr; <?php echo get_the_title($post->post_parent); ?></a></p>
</ins><span class="cx">
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h2 class="entry-title"><?php the_title(); ?></h2>
</span><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span>
</del><ins>+ <span class="meta-prep meta-prep-author"><?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( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</span><del>- <span class="meta-sep"> | </span>
- <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span>
- <span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php echo get_the_date(); ?></abbr></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</del><ins>+ <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
+ <span class="meta-prep meta-prep-entry-date"><?php _e( 'Published ', 'twentyten' ); ?></span>
+ <span class="entry-date"><abbr class="published" title="<?php the_time() ?>"><?php echo get_the_date(); ?></abbr></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ); ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx"> <div class="nav-next"><?php next_image_link( false ); ?></div>
</span><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php else : ?>
</span><del>- <a href="<?php echo wp_get_attachment_url($post->ID) ?>" title="<?php echo esc_attr( get_the_title($post->ID) ); ?>" rel="attachment"><?php echo basename(get_permalink()) ?></a>
</del><ins>+ <a href="<?php echo wp_get_attachment_url($post->ID); ?>" title="<?php echo esc_attr( get_the_title($post->ID) ); ?>" rel="attachment"><?php echo basename(get_permalink()); ?></a>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><del>- <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div>
</del><ins>+ <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt(); ?></div>
</ins><span class="cx">
</span><del>-<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</del><ins>+ <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="lines">@@ -48,18 +48,18 @@
</span><span class="cx"> get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute('echo=0'),
</span><del>- get_post_comments_feed_link() ) ?>
</del><ins>+ get_post_comments_feed_link() ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
</span><del>- <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>
</del><ins>+ <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
</ins><span class="cx"> <?php elseif ( !comments_open() && pings_open() ) : // Only trackbacks open ?>
</span><del>- <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ) ?>
</del><ins>+ <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', 'twentyten' ), get_trackback_url() ); ?>
</ins><span class="cx"> <?php elseif ( comments_open() && !pings_open() ) : // Only comments open ?>
</span><del>- <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ) ?>
</del><ins>+ <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?>
</ins><span class="cx"> <?php elseif ( !comments_open() && !pings_open() ) : // Comments and trackbacks closed ?>
</span><del>- <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ) ?>
</del><ins>+ <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
</ins><span class="cx"> <?php endif; ?>
</span><del>-<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
</del><ins>+<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<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="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/author.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -5,16 +5,16 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='" . esc_attr($authordata->display_name) . "' rel='me'>" . esc_html($authordata->display_name) . "</a>" ) ?></h1>
</del><ins>+ <h1 class="page-title author"><?php printf( __( 'Author Archives: <span class="vcard">%s</span>', 'twentyten' ), "<a class='url fn n' href='$authordata->user_url' title='" . esc_attr($authordata->display_name) . "' rel='me'>" . esc_html($authordata->display_name) . "</a>" ); ?></h1>
</ins><span class="cx">
</span><span class="cx"> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</span><span class="cx"> <div id="entry-author-info">
</span><span class="cx"> <div id="author-avatar">
</span><del>-<?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</del><ins>+ <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</ins><span class="cx"> </div><!-- #author-avatar -->
</span><span class="cx"> <div id="author-description">
</span><span class="cx"> <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</span><del>-<?php the_author_meta('description'); ?>
</del><ins>+ <?php the_author_meta('description'); ?>
</ins><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- .entry-author-info -->
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -34,21 +34,20 @@
</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="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php
- the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span><del>-<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</del><ins>+ <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</ins><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
</del><ins>+ <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
</ins><span class="cx"> <span class="meta-sep"> | </span>
</span><del>- <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="lines">@@ -56,8 +55,8 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/category.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-
</del><span class="cx"> <?php get_header(); ?>
</span><span class="cx">
</span><span class="cx"> <div id="container">
</span><span class="lines">@@ -6,15 +5,15 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ) ?> <span><?php single_cat_title() ?></span></span></h1>
</del><ins>+ <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ); ?> <span><?php single_cat_title(); ?></span></span></h1>
</ins><span class="cx"> <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -24,25 +23,24 @@
</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="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php
- the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"><?php _e(' by ', 'twentyten'); ?></span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span><del>-<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</del><ins>+ <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</ins><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>-<?php if ( $cats_meow = cats_meow(', ') ) : // Returns categories other than the one queried ?>
- <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ) ?></span>
- <span class="meta-sep"> | </span>
</del><ins>+<?php if ( $cats_meow = cats_meow( ', ' ) ) : // Returns categories other than the one queried ?>
+ <span class="cat-links"><?php printf( __( 'Also posted in %s', 'twentyten' ), $cats_meow ); ?></span>
+ <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
</ins><span class="cx"> <?php endif ?>
</span><del>- <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="lines">@@ -50,8 +48,8 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> <div id="comments">
</span><span class="cx"> <?php
</span><span class="cx"> // Do not delete these lines
</span><del>- $req = get_option('require_name_email'); // Checks if fields are required.
</del><ins>+ $req = get_option( 'require_name_email' ); // Checks if fields are required.
</ins><span class="cx"> if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) )
</span><del>- die ( 'Please do not load this page directly. Thanks!' );
</del><ins>+ die ( __( 'Please do not load this page directly. Thanks!', 'twentyten' ) );
</ins><span class="cx"> if ( post_password_required() ) :
</span><span class="cx"> ?>
</span><del>- <div class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'twentyten') ?></div>
</del><ins>+ <div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></div>
</ins><span class="cx"> </div><!-- .comments -->
</span><span class="cx"> <?php
</span><span class="cx"> return;
</span><span class="lines">@@ -22,19 +22,19 @@
</span><span class="cx">
</span><span class="cx"> <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
</span><span class="cx"> <div class="navigation">
</span><del>- <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
- <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
</del><ins>+ <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; // check for comment navigation ?>
</span><span class="cx">
</span><span class="cx"> <ol class="commentlist">
</span><del>- <?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
</del><ins>+ <?php wp_list_comments( array('callback' => 'twentyten_comment') ); ?>
</ins><span class="cx"> </ol>
</span><span class="cx">
</span><span class="cx"> <?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
</span><span class="cx"> <div class="navigation">
</span><del>- <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ) ?></div>
- <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ) ?></div>
</del><ins>+ <div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
+ <div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; // check for comment navigation ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -3,10 +3,10 @@
</span><span class="cx"> <div id="footer">
</span><span class="cx"> <div id="colophon">
</span><span class="cx">
</span><del>-<?php get_sidebar('footer'); ?>
</del><ins>+<?php get_sidebar( 'footer' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="site-info">
</span><del>- <a href="<?php bloginfo( 'url' ) ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ) ?></a>
</del><ins>+ <a href="<?php home_url() ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="site-generator">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> // Set the content width based on the Theme CSS
</span><del>-$content_width = apply_filters('twentyten_content_width', 640 );
</del><ins>+$content_width = apply_filters( 'twentyten_content_width', 640 );
</ins><span class="cx">
</span><span class="cx"> // Your Changeable header business starts here
</span><span class="cx"> // No CSS, just IMG call
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><del>-add_custom_image_header('', 'twentyten_admin_header_style');
</del><ins>+add_custom_image_header( '', 'twentyten_admin_header_style' );
</ins><span class="cx"> // and thus ends the changeable header business
</span><span class="cx">
</span><span class="cx"> add_custom_background();
</span><span class="lines">@@ -44,118 +44,119 @@
</span><span class="cx"> $locale = get_locale();
</span><span class="cx"> $locale_file = TEMPLATEPATH . "/languages/$locale.php";
</span><span class="cx"> if ( is_readable($locale_file) )
</span><del>- require_once($locale_file);
</del><ins>+ require_once( $locale_file );
</ins><span class="cx">
</span><span class="cx"> // Get the page number
</span><del>-function get_page_number() {
</del><ins>+function twentyten_get_page_number() {
</ins><span class="cx"> if ( get_query_var('paged') )
</span><del>- echo ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
</del><ins>+ echo ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var('paged');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Control excerpt length
</span><del>-function new_excerpt_length($length) {
</del><ins>+function twentyten_new_excerpt_length( $length ) {
</ins><span class="cx"> return 40;
</span><span class="cx"> }
</span><del>-add_filter('excerpt_length', 'new_excerpt_length');
</del><ins>+add_filter( 'excerpt_length', 'twentyten_new_excerpt_length' );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // Make a nice read more link on excerpts
</span><del>-function new_excerpt_more($more) {
</del><ins>+function twentyten_new_excerpt_more($more) {
</ins><span class="cx"> return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
</span><span class="cx"> }
</span><del>-add_filter('excerpt_more', 'new_excerpt_more');
</del><ins>+add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' );
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> // Template for comments and pingbacks
</span><del>-function twentyten_comment($comment, $args, $depth) {
- $GLOBALS ['comment'] = $comment; ?>
- <?php if ('' == $comment->comment_type) { ?>
- <li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
</del><ins>+function twentyten_list_comment( $comment, $args, $depth ) {
+ $GLOBALS['comment'] = $comment; ?>
+ <?php if ( '' == $comment->comment_type ) { ?>
+ <li <?php comment_class(); ?> id="li-comment-<?php comment_ID(); ?>">
</ins><span class="cx"> <div id="comment-<?php comment_ID(); ?>">
</span><span class="cx"> <div class="comment-author vcard">
</span><del>- <?php echo get_avatar($comment, 40); ?>
-
- <?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()) ?>
</del><ins>+ <?php echo get_avatar( $comment, 40 ); ?>
+ <?php printf( __('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link() ); ?>
</ins><span class="cx"> </div>
</span><del>- <?php if ($comment->comment_approved == '0') : ?>
- <em><?php _e('Your comment is awaiting moderation.') ?></em>
</del><ins>+ <?php if ( $comment->comment_approved == '0' ) : ?>
+ <em><?php _e( 'Your comment is awaiting moderation.', 'twentyten' ); ?></em>
</ins><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'), get_comment_date(), get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),' ','') ?></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'), get_comment_date(), get_comment_time()); ?></a><?php edit_comment_link(__('(Edit)', 'twentyten'),' ',''); ?></div>
</ins><span class="cx">
</span><del>- <div class="comment-body"><?php comment_text() ?></div>
</del><ins>+ <div class="comment-body"><?php comment_text(); ?></div>
</ins><span class="cx">
</span><span class="cx"> <div class="reply">
</span><del>- <?php comment_reply_link(array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
</del><ins>+ <?php comment_reply_link( array_merge( $args, array('depth' => $depth, 'max_depth' => $args['max_depth'])) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <li class="post pingback">
</span><del>- <p><?php _e('Pingback:') ?> <?php comment_author_link ()?><?php edit_comment_link ( 'edit', '&nbsp;&nbsp;', '' ); ?></p>
</del><ins>+ <p><?php _e( 'Pingback: ', 'twentyten' ); ?><?php comment_author_link(); ?><?php edit_comment_link ( __('edit', 'twentyten'), '&nbsp;&nbsp;', '' ); ?></p>
</ins><span class="cx"> <?php }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Make the Visual Editor styles match the theme's styles
</span><del>-function my_editor_style($url) {
- if ( !empty($url) )
- $url .= ',';
-
</del><ins>+function twentyten_my_editor_style( $url ) {
+ if ( !empty($url) )
+ $url .= ',';
</ins><span class="cx"> // Change the path here if using sub-directory
</span><span class="cx"> $url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css';
</span><span class="cx">
</span><span class="cx"> return $url;
</span><span class="cx"> }
</span><del>-add_filter('mce_css', 'my_editor_style');
</del><ins>+add_filter( 'mce_css', 'twentyten_my_editor_style' );
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> // Remove inline styles on gallery shortcode
</span><del>-function remove_gallery_css() {
</del><ins>+function twentyten_remove_gallery_css() {
</ins><span class="cx"> return "<div class='gallery'>";
</span><span class="cx"> }
</span><del>-add_filter('gallery_style', 'remove_gallery_css');
</del><ins>+add_filter( 'gallery_style', 'twentyten_remove_gallery_css' );
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> // For category lists on category archives: Returns other categories except the current one (redundant)
</span><del>-function cats_meow($glue) {
</del><ins>+function cats_meow( $glue ) {
</ins><span class="cx"> $current_cat = single_cat_title( '', false );
</span><span class="cx"> $separator = "\n";
</span><span class="cx"> $cats = explode( $separator, get_the_category_list($separator) );
</span><span class="cx"> foreach ( $cats as $i => $str ) {
</span><span class="cx"> if ( strstr( $str, ">$current_cat<" ) ) {
</span><del>- unset($cats[$i]);
</del><ins>+ unset( $cats[$i] );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( empty($cats) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return trim(join( $glue, $cats ));
</del><ins>+ return trim( join( $glue, $cats ) );
</ins><span class="cx"> } // end cats_meow
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> // For tag lists on tag archives: Returns other tags except the current one (redundant)
</span><del>-function tag_ur_it($glue) {
</del><ins>+function tag_ur_it( $glue ) {
</ins><span class="cx"> $current_tag = single_tag_title( '', '', false );
</span><span class="cx"> $separator = "\n";
</span><span class="cx"> $tags = explode( $separator, get_the_tag_list( "", "$separator", "" ) );
</span><span class="cx"> foreach ( $tags as $i => $str ) {
</span><span class="cx"> if ( strstr( $str, ">$current_tag<" ) ) {
</span><del>- unset($tags[$i]);
</del><ins>+ unset( $tags[$i] );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( empty($tags) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return trim(join( $glue, $tags ));
</del><ins>+ return trim( join( $glue, $tags ) );
</ins><span class="cx"> } // end tag_ur_it
</span><span class="cx">
</span><span class="cx"> // Register widgetized areas
</span><del>-function theme_widgets_init() {
</del><ins>+function twentyten_widgets_init() {
</ins><span class="cx"> // Area 1
</span><del>- register_sidebar( array (
</del><ins>+ register_sidebar( array(
</ins><span class="cx"> 'name' => 'Primary Widget Area',
</span><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">@@ -163,10 +164,10 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Area 2
</span><del>- register_sidebar( array (
</del><ins>+ register_sidebar( array(
</ins><span class="cx"> 'name' => 'Secondary Widget Area',
</span><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">@@ -174,10 +175,10 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Area 3
</span><del>- register_sidebar( array (
</del><ins>+ register_sidebar( array(
</ins><span class="cx"> 'name' => 'First Footer Widget Area',
</span><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">@@ -185,10 +186,10 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Area 4
</span><del>- register_sidebar( array (
</del><ins>+ register_sidebar( array(
</ins><span class="cx"> 'name' => 'Second Footer Widget Area',
</span><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">@@ -196,10 +197,10 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Area 5
</span><del>- register_sidebar( array (
</del><ins>+ register_sidebar( array(
</ins><span class="cx"> 'name' => 'Third Footer Widget Area',
</span><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">@@ -207,10 +208,10 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Area 6
</span><del>- register_sidebar( array (
</del><ins>+ register_sidebar( array(
</ins><span class="cx"> 'name' => 'Fourth Footer Widget Area',
</span><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">@@ -220,4 +221,4 @@
</span><span class="cx"> } // end theme_widgets_init
</span><span class="cx">
</span><span class="cx"> // Add all the groovy widget areas
</span><del>-add_action( 'init', 'theme_widgets_init' );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_action( 'init', 'twentyten_widgets_init' );
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/header.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -5,15 +5,15 @@
</span><span class="cx"> if ( is_single() ) {
</span><span class="cx"> single_post_title(); echo ' | '; bloginfo('name');
</span><span class="cx"> } elseif ( is_home() || is_front_page() ) {
</span><del>- bloginfo('name'); echo ' | '; bloginfo('description'); get_page_number();
</del><ins>+ bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_get_page_number();
</ins><span class="cx"> } elseif ( is_page() ) {
</span><span class="cx"> single_post_title(''); echo ' | '; bloginfo('name');
</span><span class="cx"> } elseif ( is_search() ) {
</span><del>- printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); get_page_number(); echo ' | '; bloginfo('name');
</del><ins>+ printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_get_page_number(); echo ' | '; bloginfo('name');
</ins><span class="cx"> } elseif ( is_404() ) {
</span><span class="cx"> _e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
</span><span class="cx"> } else {
</span><del>- wp_title(''); echo ' | '; bloginfo('name'); get_page_number();
</del><ins>+ wp_title(''); echo ' | '; bloginfo('name'); twentyten_get_page_number();
</ins><span class="cx"> }
</span><span class="cx"> ?></title>
</span><span class="cx">
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx">
</span><span class="cx"> <?php wp_head(); ?>
</span><span class="cx">
</span><del>- <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( esc_attr__( '%s latest posts', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
- <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( esc_attr__( '%s latest comments', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
- <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
</del><ins>+ <link rel="alternate" type="application/rss+xml" href="<?php bloginfo( 'rss2_url' ); ?>" title="<?php printf( esc_attr__( '%s latest posts', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
+ <link rel="alternate" type="application/rss+xml" href="<?php bloginfo( 'comments_rss2_url' ); ?>" title="<?php printf( esc_attr__( '%s latest comments', 'twentyten' ), esc_html( get_bloginfo('name') ) ); ?>" />
+ <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</ins><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class(); ?>>
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> <div id="masthead">
</span><span class="cx">
</span><span class="cx"> <div id="branding">
</span><del>- <div id="site-title"><span><a href="<?php bloginfo( 'url' ) ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
- <div id="site-description"><?php bloginfo( 'description' ) ?></div>
</del><ins>+ <div id="site-title"><span><a href="<?php home_url(); ?>/" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
+ <div id="site-description"><?php bloginfo( 'description' ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> global $post;
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> </div><!-- #branding -->
</span><span class="cx">
</span><span class="cx"> <div id="access">
</span><del>- <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ) ?>"><?php _e( 'Skip to content', 'twentyten' ) ?></a></div>
</del><ins>+ <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
</ins><span class="cx"> <?php wp_page_menu( 'sort_column=menu_order' ); ?>
</span><span class="cx"> </div><!-- #access -->
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/index.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -16,23 +16,24 @@
</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="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php
-the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><del>- <div class="gallery-thumb"><a class="size-thumbnail" href="<?php the_permalink() ?>"><?php
- $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
- $total_images = count($images);
- $image = array_shift($images);
- echo wp_get_attachment_image( $image->ID, 'thumbnail' );
- ?></a></div>
</del><ins>+ <div class="gallery-thumb">
+ <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
+ $images =& get_children( array('post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) );
+ $total_images = count($images);
+ $image = array_shift($images);
+ echo wp_get_attachment_image( $image->ID, 'thumbnail' );
+ ?></a>
+ </div>
</ins><span class="cx"> <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?></em></p>
</span><span class="cx">
</span><del>- <?php the_excerpt(''); ?>
</del><ins>+ <?php the_excerpt( '' ); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><span class="lines">@@ -41,12 +42,9 @@
</span><span class="cx"> $category_link = get_category_link( $category_id );
</span><span class="cx"> ?>
</span><span class="cx"> <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
</span><del>-
- <span class="meta-sep"> | </span>
-
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
-
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -54,18 +52,17 @@
</span><span class="cx"> <?php } elseif ( in_category( 'asides' ) ) { ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</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&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php
-the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
- <span class="meta-sep"> | </span>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+ <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="lines">@@ -77,26 +74,26 @@
</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
</span><del>-the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><del>-<?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</del><ins>+ <?php the_content( __( 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
- <span class="meta-sep"> | </span>
- <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
+ <span class="meta-sep"><?php __( ' | ', 'twentyten' ); ?></span>
+ <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php comments_template(); ?>
</del><ins>+ <?php comments_template( '', true ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <?php endwhile; ?>
</span><span class="lines">@@ -104,14 +101,14 @@
</span><span class="cx"> <h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <p><?php _e( 'Apologies, but we were unable to find what you were looking for. Perhaps searching will help.', 'twentyten' ); ?></p>
</span><del>- <?php get_search_form(); ?>
</del><ins>+ <?php get_search_form(); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/page.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/page.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/page.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -8,13 +8,13 @@
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx"> <div class="entry-content">
</span><del>-<?php the_content(); ?>
-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
-<?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ) ?>
</del><ins>+ <?php the_content(); ?>
+ <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><del>-<?php comments_template(); ?>
</del><ins>+ <?php comments_template( '', true ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/search.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -9,58 +9,57 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>-<?php while ( have_posts() ) : the_post() ?>
</del><ins>+<?php while ( have_posts() ) : the_post(); ?>
</ins><span class="cx">
</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="cx">
</span><del>-<?php if ( $post->post_type == 'post' ) { ?>
</del><ins>+<?php if ( $post->post_type != 'page' ) : ?>
</ins><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php
- the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"> <?php _e( 'by ', 'twentyten' ); ?> </span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><del>-<?php } ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span><del>-<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</del><ins>+ <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+ <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</ins><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><del>-<?php if ( $post->post_type == 'post' ) { ?>
</del><ins>+<?php if ( $post->post_type != 'page' ) : ?>
</ins><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><del>- <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ) ?>
- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __('Tagged ', 'twentyten' ) . '</span>', ", ", "</span>\n\t\t\t\t\t\t<span class=\"meta-sep\">|</span>\n" ); ?>
+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><del>-<?php } ?>
</del><ins>+<?php endif; ?>
</ins><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="cx"> <?php endwhile; ?>
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><span class="cx"> <div id="post-0" class="post no-results not-found">
</span><del>- <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ) ?></h2>
</del><ins>+ <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
</ins><span class="cx"> <div class="entry-content">
</span><span class="cx"> <p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyten' ); ?></p>
</span><del>- <?php get_search_form(); ?>
</del><ins>+ <?php get_search_form(); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/searchform.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/searchform.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/searchform.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>">
</span><span class="cx"> <div>
</span><del>- <label for="s"><?php _e('Search', 'twentyten'); ?></label>
</del><ins>+ <label for="s"><?php _e( 'Search', 'twentyten' ); ?></label>
</ins><span class="cx"> <input type="text" id="s" name="s" />
</span><del>- <input type="submit" id="searchsubmit" value="<?php esc_attr_e('Search', 'twentyten'); ?>" />
</del><ins>+ <input type="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyten' ); ?>" />
</ins><span class="cx"> </div>
</span><span class="cx"> </form>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar-footer.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -1,11 +1,14 @@
</span><span class="cx"> <?php
</span><del>- if ( is_active_sidebar('first-footer-widget-area') || is_active_sidebar('second-footer-widget-area') || is_active_sidebar('third-footer-widget-area') || is_active_sidebar('fourth-footer-widget-area') ) :
</del><ins>+ if ( is_active_sidebar('first-footer-widget-area') ||
+ is_active_sidebar('second-footer-widget-area') ||
+ is_active_sidebar('third-footer-widget-area') ||
+ is_active_sidebar('fourth-footer-widget-area') ) :
</ins><span class="cx"> ?>
</span><span class="cx"> <div id="footer-widget-area">
</span><span class="cx"> <?php if ( is_active_sidebar('first-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="first" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><del>- <?php dynamic_sidebar('first-footer-widget-area'); ?>
</del><ins>+ <?php dynamic_sidebar( 'first-footer-widget-area' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #first .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -13,7 +16,7 @@
</span><span class="cx"> <?php if ( is_active_sidebar('second-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="second" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><del>- <?php dynamic_sidebar('second-footer-widget-area'); ?>
</del><ins>+ <?php dynamic_sidebar( 'second-footer-widget-area' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #second .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -21,7 +24,7 @@
</span><span class="cx"> <?php if ( is_active_sidebar('third-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="third" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><del>- <?php dynamic_sidebar('third-footer-widget-area'); ?>
</del><ins>+ <?php dynamic_sidebar( 'third-footer-widget-area' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #third .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -29,7 +32,7 @@
</span><span class="cx"> <?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?>
</span><span class="cx"> <div id="fourth" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><del>- <?php dynamic_sidebar('fourth-footer-widget-area'); ?>
</del><ins>+ <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #fourth .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/sidebar.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -6,30 +6,28 @@
</span><span class="cx"> </li>
</span><span class="cx">
</span><span class="cx"> <li id="archives" class="widget-container">
</span><del>- <h3 class="widget-title"><?php _e('Archives', 'twentyten') ?></h3>
</del><ins>+ <h3 class="widget-title"><?php _e( 'Archives', 'twentyten' ); ?></h3>
</ins><span class="cx"> <ul>
</span><del>-<?php wp_get_archives('type=monthly') ?>
</del><ins>+ <?php wp_get_archives( 'type=monthly' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </li>
</span><span class="cx">
</span><span class="cx"> <li id="meta" class="widget-container">
</span><del>- <h3 class="widget-title"><?php _e('Meta', 'twentyten') ?></h3>
</del><ins>+ <h3 class="widget-title"><?php _e( 'Meta', 'twentyten' ); ?></h3>
</ins><span class="cx"> <ul>
</span><del>- <?php wp_register() ?>
-
- <li><?php wp_loginout() ?></li>
- <?php wp_meta() ?>
-
</del><ins>+ <?php wp_register(); ?>
+ <li><?php wp_loginout(); ?></li>
+ <?php wp_meta(); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </li>
</span><del>-<?php endif; // end primary widget area ?>
</del><ins>+<?php endif; // end primary widget area ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #primary .widget-area -->
</span><span class="cx">
</span><span class="cx"> <?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?>
</span><span class="cx"> <div id="secondary" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><del>- <?php dynamic_sidebar('secondary-widget-area'); ?>
</del><ins>+ <?php dynamic_sidebar( 'secondary-widget-area' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #secondary .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/single.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -6,37 +6,36 @@
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div>
</del><ins>+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx">
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted by ', 'twentyten'); ?></span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
- <span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span>
- <a href="<?php
-the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ) ?>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted by ', 'twentyten' ); ?></span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
+ <span class="meta-sep"><?php _e( ' on ', 'twentyten' ); ?> </span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t" ); ?>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><del>-<?php the_content(); ?>
-<?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>') ?>
</del><ins>+ <?php the_content(); ?>
+ <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</ins><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</span><span class="cx"> <div id="entry-author-info">
</span><span class="cx"> <div id="author-avatar">
</span><del>-<?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</del><ins>+ <?php echo get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); ?>
</ins><span class="cx"> </div><!-- #author-avatar -->
</span><span class="cx"> <div id="author-description">
</span><del>- <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
-<?php the_author_meta('description'); ?>
</del><ins>+ <h2><?php _e( 'About ', 'twentyten' ); ?><?php the_author(); ?></h2>
+ <?php the_author_meta('description'); ?>
</ins><span class="cx"> <div id="author-link">
</span><del>- <a href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php _e('View all posts by ', 'twentyten'); ?><?php the_author(); ?> &rarr;</a>
</del><ins>+ <a href="<?php echo get_author_posts_url( $authordata->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>
</ins><span class="cx"> </div><!-- #author-link -->
</span><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- .entry-author-info -->
</span><span class="lines">@@ -48,18 +47,18 @@
</span><span class="cx"> get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ),
</span><span class="cx"> get_permalink(),
</span><span class="cx"> the_title_attribute('echo=0'),
</span><del>- get_post_comments_feed_link() ) ?>
</del><ins>+ get_post_comments_feed_link() ); ?>
</ins><span class="cx">
</span><del>-<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ) ?>
</del><ins>+<?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<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 class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ) ?></div>
- <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ) ?></div>
</del><ins>+ <div class="nav-previous"><?php previous_post_link( '%link', '<span class="meta-nav">&larr;</span> %title' ); ?></div>
+ <div class="nav-next"><?php next_post_link( '%link', '%title <span class="meta-nav">&rarr;</span>' ); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx">
</span><del>-<?php comments_template('', true); ?>
</del><ins>+ <?php comments_template( '', true ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13127 => 13128)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-02-14 00:12:08 UTC (rev 13127)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-02-14 01:00:22 UTC (rev 13128)
</span><span class="lines">@@ -5,14 +5,14 @@
</span><span class="cx">
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><del>- <h1 class="page-title"><?php _e( 'Tag Archives:', 'twentyten' ) ?> <span><?php single_tag_title() ?></span></h1>
</del><ins>+ <h1 class="page-title"><?php _e( 'Tag Archives: ', 'twentyten' ); ?><span><?php single_tag_title(); ?></span></h1>
</ins><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-above" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-above -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="lines">@@ -22,24 +22,24 @@
</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="cx">
</span><span class="cx"> <div class="entry-meta">
</span><del>- <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
- <a href="<?php the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
- <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="meta-prep meta-prep-author"><?php _e( 'Posted on ', 'twentyten' ); ?></span>
+ <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
+ <span class="meta-sep"><?php _e( ' by ', 'twentyten' ); ?></span>
+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span><del>-<?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</del><ins>+ <?php the_excerpt( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</ins><span class="cx"> </div><!-- .entry-summary -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list(', '); ?></span>
- <span class="meta-sep"> | </span>
</del><ins>+ <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php echo get_the_category_list( ', ' ); ?></span>
+ <span class="meta-sep"><?php _e( ' | ', 'twentyten' ); ?></span>
</ins><span class="cx"> <?php if ( $tag_ur_it = tag_ur_it(', ') ) : // Returns tags other than the one queried ?>
</span><del>- <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ) ?></span>
</del><ins>+ <span class="tag-links"><?php printf( __( 'Also tagged %s', 'twentyten' ), $tag_ur_it ); ?></span>
</ins><span class="cx"> <?php endif; ?>
</span><del>- <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ) ?></span>
- <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ) ?>
</del><ins>+ <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), "<span class=\"meta-sep\">|</span>\n\t\t\t\t\t\t<span class=\"edit-link\">", "</span>\n\t\t\t\t\t\n" ); ?>
</ins><span class="cx"> </div><!-- #entry-utility -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="cx">
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx">
</span><span class="cx"> <?php global $wp_query; $total_pages = $wp_query->max_num_pages; if ( $total_pages > 1 ) { ?>
</span><span class="cx"> <div id="nav-below" class="navigation">
</span><del>- <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )) ?></div>
- <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )) ?></div>
</del><ins>+ <div class="nav-previous"><?php next_posts_link(__( '<span class="meta-nav">&larr;</span> Older posts', 'twentyten' )); ?></div>
+ <div class="nav-next"><?php previous_posts_link(__( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyten' )); ?></div>
</ins><span class="cx"> </div><!-- #nav-below -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>