<!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>[13720] trunk/wp-content/themes/twentyten:
Coding standards cleanup in twentyten, see #9015.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13720">13720</a></dd>
<dt>Author</dt> <dd>iammattthomas</dd>
<dt>Date</dt> <dd>2010-03-16 20:17:22 +0000 (Tue, 16 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Coding standards cleanup in twentyten, see <a href="http://trac.wordpress.org/ticket/9015">#9015</a>. Props sivel</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenonecolumnpagephp">trunk/wp-content/themes/twentyten/onecolumn-page.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="#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="trunkwpcontentthemestwentytenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/archive.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -23,4 +23,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -5,7 +5,7 @@
</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="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><span class="cx"> printf(__( '<span class="meta-prep meta-prep-author"> By </span> <span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', 'twentyten'),
</span><del>- get_author_posts_url( get_the_author_meta('ID') ),
</del><ins>+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
</ins><span class="cx"> sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
</span><span class="cx"> get_the_author()
</span><span class="cx"> );
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <?php
</span><span class="cx"> printf( __( '<span class="meta-prep meta-prep-entry-date">Published </span> <span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>', 'twentyten'),
</span><del>- esc_attr(get_the_time()),
</del><ins>+ esc_attr( get_the_time() ),
</ins><span class="cx"> get_the_date()
</span><span class="cx"> );
</span><span class="cx"> ?>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
</span><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><span class="cx"> <?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
</span><span class="cx"> <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</span><span class="lines">@@ -60,21 +60,21 @@
</span><span class="cx"> }
</span><span class="cx"> printf(
</span><span class="cx"> $utility_text,
</span><del>- get_the_category_list(', '),
</del><ins>+ get_the_category_list( ', ' ),
</ins><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><del>- the_title_attribute('echo=0'),
</del><ins>+ the_title_attribute( 'echo=0' ),
</ins><span class="cx"> get_post_comments_feed_link()
</span><span class="cx"> );
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
</span><span class="cx"> <?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() ); ?>
</span><del>-<?php elseif ( !comments_open() && pings_open() ) : // Only trackbacks open ?>
</del><ins>+<?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
</ins><span class="cx"> <?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() ); ?>
</span><del>-<?php elseif ( comments_open() && !pings_open() ) : // Only comments open ?>
</del><ins>+<?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>
</ins><span class="cx"> <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', 'twentyten' ); ?>
</span><del>-<?php elseif ( !comments_open() && !pings_open() ) : // Comments and trackbacks closed ?>
</del><ins>+<?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
</ins><span class="cx"> <?php _e( 'Both comments and trackbacks are currently closed.', 'twentyten' ); ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), "\n\t\t\t\t\t<span class=\"edit-link\">", "</span>" ); ?>
</span><span class="lines">@@ -87,4 +87,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/author.php 2010-03-16 20:17:22 UTC (rev 13720)
</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='" . get_author_posts_url( get_the_author_meta('ID') ) . "' title='" . esc_attr(get_the_author()) . "' rel='me'>" . get_the_author() . "</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='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
</ins><span class="cx">
</span><del>-<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</del><ins>+<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their decscription show a bio on their entries ?>
</ins><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 printf(__('About %s', 'twentyten'), get_the_author()); ?></h2>
- <?php the_author_meta('description'); ?>
</del><ins>+ <h2><?php printf( __( 'About %s', 'twentyten' ), get_the_author() ); ?></h2>
+ <?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">@@ -27,4 +27,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/category.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><span class="cx"> <h1 class="page-title"><?php
</span><del>- printf(__( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title('', false) . '</span>');
</del><ins>+ printf( __( 'Category Archives: %s', 'twentyten' ), '<span>' . single_cat_title( '', false ) . '</span>' );
</ins><span class="cx"> ?></h1>
</span><del>- <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</del><ins>+ <?php $categorydesc = category_description(); if ( ! empty( $categorydesc ) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php get_generic_template( 'loop', 'category' ); ?>
</span><span class="cx">
</span><span class="lines">@@ -14,4 +14,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -13,26 +13,26 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( have_comments() ) : ?>
</span><span class="cx"> <h3 id="comments-title"><?php comments_number(
</span><del>- sprintf(__('No Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),
- sprintf(__('One Response to %s', 'twentyten'), '<em>' . get_the_title() . '</em>'),
- sprintf(__('%% Responses to %s', 'twentyten'), '<em>' . get_the_title() . '</em>')
</del><ins>+ sprintf( __( 'No Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ),
+ sprintf( __( 'One Response to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' ),
+ sprintf( __( '%% Responses to %s', 'twentyten' ), '<em>' . get_the_title() . '</em>' )
</ins><span class="cx"> ); ?> </h3>
</span><span class="cx">
</span><span class="cx"> <?php if ( get_comment_pages_count() > 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 if ( get_comment_pages_count() > 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="lines">@@ -42,11 +42,11 @@
</span><span class="cx">
</span><span class="cx"> <?php else : // if comments are closed ?>
</span><span class="cx">
</span><del>- <p class="nocomments"><?php _e('Comments are closed.', 'twentyten'); ?></p>
</del><ins>+ <p class="nocomments"><?php _e( 'Comments are closed.', 'twentyten' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php comment_form(); ?>
</span><span class="cx">
</span><del>-</div><!-- #comments -->
</del><span class="cx">\ No newline at end of file
</span><ins>+</div><!-- #comments -->
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -6,11 +6,11 @@
</span><span class="cx"> <?php get_sidebar( 'footer' ); ?>
</span><span class="cx">
</span><span class="cx"> <div id="site-info">
</span><del>- <a href="<?php echo home_url('/') ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a>
</del><ins>+ <a href="<?php echo 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><del>- <?php printf( __('Proudly powered by <span id="generator-link">%s</span>.', 'twentyten'), '<a href="http://wordpress.org/" title="' . esc_attr__( 'Semantic Personal Publishing Platform', 'twentyten' ) . '" rel="generator">' . __( 'WordPress', 'twentyten' ) . '</a>' ); ?>
</del><ins>+ <?php printf( __( 'Proudly powered by <span id="generator-link">%s</span>.', 'twentyten' ), '<a href="http://wordpress.org/" title="' . esc_attr__( 'Semantic Personal Publishing Platform', 'twentyten' ) . '" rel="generator">' . __( 'WordPress', 'twentyten' ) . '</a>' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> </div><!-- #colophon -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -8,8 +8,8 @@
</span><span class="cx"> function twentyten_init() {
</span><span class="cx"> // Your Changeable header business starts here
</span><span class="cx"> // No CSS, just IMG call
</span><del>- define( 'HEADER_TEXTCOLOR', '');
- define( 'HEADER_IMAGE', '%s/images/headers/forestfloor.jpg'); // %s is theme dir uri
</del><ins>+ define( 'HEADER_TEXTCOLOR', '' );
+ define( 'HEADER_IMAGE', '%s/images/headers/forestfloor.jpg' ); // %s is theme dir uri
</ins><span class="cx"> define( 'HEADER_IMAGE_WIDTH', apply_filters( 'twentyten_header_image_width', 940 ) );
</span><span class="cx"> define( 'HEADER_IMAGE_HEIGHT', apply_filters( 'twentyten_header_image_height', 198 ) );
</span><span class="cx"> define( 'NO_HEADER_TEXT', true );
</span><span class="lines">@@ -17,14 +17,48 @@
</span><span class="cx"> add_custom_image_header( '', 'twentyten_admin_header_style' );
</span><span class="cx"> // and thus ends the changeable header business
</span><span class="cx">
</span><del>- register_default_headers( array('berries' => array('url' => '%s/images/headers/berries.jpg', 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg', 'description' => __('Berries')),
- 'cherryblossom' => array( 'url' => '%s/images/headers/cherryblossoms.jpg', 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg', 'description' => __('Cherry Blossoms')),
- 'concave' => array('url' => '%s/images/headers/concave.jpg', 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg', 'description' => __('Concave')),
- 'fern' => array('url' => '%s/images/headers/fern.jpg', 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg', 'description' => __('Fern')),
- 'forestfloor' => array('url' => '%s/images/headers/forestfloor.jpg', 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg', 'description' => __('Forest Floor')),
- 'inkwell' => array('url' => '%s/images/headers/inkwell.jpg', 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg', 'description' => __('Ink Well')),
- 'path' => array('url' => '%s/images/headers/path.jpg', 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg', 'description' => __('Path')),
- 'sunset' => array('url' => '%s/images/headers/sunset.jpg', 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg', 'description' => __('Sunset')) ) );
</del><ins>+ register_default_headers( array (
+ 'berries' => array (
+ 'url' => '%s/images/headers/berries.jpg',
+ 'thumbnail_url' => '%s/images/headers/berries-thumbnail.jpg',
+ 'description' => __( 'Berries' )
+ ),
+ 'cherryblossom' => array (
+ 'url' => '%s/images/headers/cherryblossoms.jpg',
+ 'thumbnail_url' => '%s/images/headers/cherryblossoms-thumbnail.jpg',
+ 'description' => __( 'Cherry Blossoms' )
+ ),
+ 'concave' => array (
+ 'url' => '%s/images/headers/concave.jpg',
+ 'thumbnail_url' => '%s/images/headers/concave-thumbnail.jpg',
+ 'description' => __( 'Concave' )
+ ),
+ 'fern' => array (
+ 'url' => '%s/images/headers/fern.jpg',
+ 'thumbnail_url' => '%s/images/headers/fern-thumbnail.jpg',
+ 'description' => __( 'Fern' )
+ ),
+ 'forestfloor' => array (
+ 'url' => '%s/images/headers/forestfloor.jpg',
+ 'thumbnail_url' => '%s/images/headers/forestfloor-thumbnail.jpg',
+ 'description' => __( 'Forest Floor' )
+ ),
+ 'inkwell' => array (
+ 'url' => '%s/images/headers/inkwell.jpg',
+ 'thumbnail_url' => '%s/images/headers/inkwell-thumbnail.jpg',
+ 'description' => __( 'Ink Well' )
+ ),
+ 'path' => array (
+ 'url' => '%s/images/headers/path.jpg',
+ 'thumbnail_url' => '%s/images/headers/path-thumbnail.jpg',
+ 'description' => __( 'Path' )
+ ),
+ 'sunset' => array (
+ 'url' => '%s/images/headers/sunset.jpg',
+ 'thumbnail_url' => '%s/images/headers/sunset-thumbnail.jpg',
+ 'description' => __( 'Sunset' )
+ )
+ ) );
</ins><span class="cx">
</span><span class="cx"> add_custom_background();
</span><span class="cx">
</span><span class="lines">@@ -75,8 +109,8 @@
</span><span class="cx"> // Get the page number
</span><span class="cx"> if ( ! function_exists( 'twentyten_get_page_number' ) ) :
</span><span class="cx"> function twentyten_get_page_number() {
</span><del>- if ( get_query_var('paged') )
- return ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
</del><ins>+ if ( get_query_var( 'paged' ) )
+ return ' | ' . __( 'Page ' , 'twentyten' ) . get_query_var( 'paged' );
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="lines">@@ -98,7 +132,7 @@
</span><span class="cx">
</span><span class="cx"> // Make a nice read more link on excerpts
</span><span class="cx"> if ( ! function_exists( 'twentyten_excerpt_more' ) ) :
</span><del>-function twentyten_excerpt_more($more) {
</del><ins>+function twentyten_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><span class="cx"> endif;
</span><span class="lines">@@ -121,7 +155,7 @@
</span><span class="cx"> <br />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),' ','' ); ?></div>
</del><ins>+ <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>"><?php printf( __( '%1$s at %2$s' ), get_comment_date(), get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)', 'twentyten' ),' ','' ); ?></div>
</ins><span class="cx">
</span><span class="cx"> <div class="comment-body"><?php comment_text(); ?></div>
</span><span class="cx">
</span><span class="lines">@@ -147,27 +181,27 @@
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyten_cat_list' ) ) :
</span><span class="cx"> function twentyten_cat_list() {
</span><del>- return twentyten_term_list('category', ', ', __('Posted in %s', 'twentyten'), __('Also posted in %s', 'twentyten') );
</del><ins>+ return twentyten_term_list( 'category', ', ', __( 'Posted in %s', 'twentyten' ), __( 'Also posted in %s', 'twentyten' ) );
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyten_tag_list' ) ) :
</span><span class="cx"> function twentyten_tag_list() {
</span><del>- return twentyten_term_list('post_tag', ', ', __('Tagged %s', 'twentyten'), __('Also tagged %s', 'twentyten') );
</del><ins>+ return twentyten_term_list( 'post_tag', ', ', __( 'Tagged %s', 'twentyten' ), __( 'Also tagged %s', 'twentyten' ) );
</ins><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> if ( ! function_exists( 'twentyten_term_list' ) ) :
</span><del>-function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '') {
</del><ins>+function twentyten_term_list( $taxonomy, $glue = ', ', $text = '', $also_text = '' ) {
</ins><span class="cx"> global $wp_query, $post;
</span><span class="cx"> $current_term = $wp_query->get_queried_object();
</span><del>- $terms = wp_get_object_terms($post->ID, $taxonomy);
</del><ins>+ $terms = wp_get_object_terms( $post->ID, $taxonomy );
</ins><span class="cx"> // If we're viewing a Taxonomy page..
</span><del>- if ( isset($current_term->taxonomy) && $taxonomy == $current_term->taxonomy ) {
</del><ins>+ if ( isset( $current_term->taxonomy ) && $taxonomy == $current_term->taxonomy ) {
</ins><span class="cx"> // Remove the term from display.
</span><del>- foreach ( (array)$terms as $key => $term ) {
</del><ins>+ foreach ( (array) $terms as $key => $term ) {
</ins><span class="cx"> if ( $term->term_id == $current_term->term_id ) {
</span><del>- unset($terms[$key]);
</del><ins>+ unset( $terms[$key] );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -176,11 +210,11 @@
</span><span class="cx"> }
</span><span class="cx"> $tlist = array();
</span><span class="cx"> $rel = 'category' == $taxonomy ? 'rel="category"' : 'rel="tag"';
</span><del>- foreach ( (array)$terms as $term ) {
</del><ins>+ foreach ( (array) $terms as $term ) {
</ins><span class="cx"> $tlist[] = '<a href="' . get_term_link( $term, $taxonomy ) . '" title="' . esc_attr( sprintf( __( 'View all posts in %s', 'twentyten' ), $term->name ) ) . '" ' . $rel . '>' . $term->name . '</a>';
</span><span class="cx"> }
</span><del>- if ( !empty($tlist) )
- return sprintf($text, join($glue, $tlist));
</del><ins>+ if ( ! empty( $tlist ) )
+ return sprintf( $text, join( $glue, $tlist ) );
</ins><span class="cx"> return '';
</span><span class="cx"> }
</span><span class="cx"> endif;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/header.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -1,25 +1,25 @@
</span><span class="cx"> <!DOCTYPE html>
</span><span class="cx"> <html <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><del>- <meta charset="<?php bloginfo('charset'); ?>" />
</del><ins>+ <meta charset="<?php bloginfo( 'charset' ); ?>" />
</ins><span class="cx"> <title><?php
</span><span class="cx"> if ( is_single() ) {
</span><del>- single_post_title(); echo ' | '; bloginfo('name');
</del><ins>+ single_post_title(); echo ' | '; bloginfo( 'name' );
</ins><span class="cx"> } elseif ( is_home() || is_front_page() ) {
</span><del>- bloginfo('name'); echo ' | '; bloginfo('description'); twentyten_the_page_number();
</del><ins>+ bloginfo( 'name' ); echo ' | '; bloginfo( 'description' ); twentyten_the_page_number();
</ins><span class="cx"> } elseif ( is_page() ) {
</span><del>- single_post_title(''); echo ' | '; bloginfo('name');
</del><ins>+ single_post_title( '' ); echo ' | '; bloginfo( 'name' );
</ins><span class="cx"> } elseif ( is_search() ) {
</span><del>- printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); twentyten_the_page_number(); echo ' | '; bloginfo('name');
</del><ins>+ printf( __( 'Search results for "%s"', 'twentyten' ), esc_html( $s ) ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
</ins><span class="cx"> } elseif ( is_404() ) {
</span><del>- _e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
</del><ins>+ _e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
</ins><span class="cx"> } else {
</span><del>- wp_title(''); echo ' | '; bloginfo('name'); twentyten_the_page_number();
</del><ins>+ wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
</ins><span class="cx"> }
</span><span class="cx"> ?></title>
</span><span class="cx"> <link rel="profile" href="http://gmpg.org/xfn/11" />
</span><del>- <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo('stylesheet_url'); ?>" />
- <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
</del><ins>+ <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
+ <link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo( 'stylesheet_directory' ); ?>/print.css" />
</ins><span class="cx"> <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
</span><span class="cx"> <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</span><span class="cx"> <?php wp_head(); ?>
</span><span class="lines">@@ -30,15 +30,15 @@
</span><span class="cx"> <div id="header">
</span><span class="cx"> <div id="masthead">
</span><span class="cx"> <div id="branding">
</span><del>- <div id="site-title"><span><a href="<?php echo home_url('/'); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
</del><ins>+ <div id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></div>
</ins><span class="cx"> <div id="site-description"><?php bloginfo( 'description' ); ?></div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
</del><ins>+ if ( is_singular() && has_post_thumbnail( $post->ID ) ) :
</ins><span class="cx"> echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
</span><del>- } else { ?>
</del><ins>+ else : ?>
</ins><span class="cx"> <img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
</span><del>- <?php } ?>
</del><ins>+ <?php endif; ?>
</ins><span class="cx"> </div><!-- #branding -->
</span><span class="cx">
</span><span class="cx"> <div id="access">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php if ( $wp_query->max_num_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 endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -18,15 +18,15 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx"> <?php if ( in_category( 'Gallery' ) ) : ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><del>- printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
</del><ins>+ printf( __( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten' ),
</ins><span class="cx"> get_permalink(),
</span><span class="cx"> esc_attr( get_the_time() ),
</span><span class="cx"> get_the_date(),
</span><del>- get_author_posts_url( get_the_author_meta('ID') ),
</del><ins>+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
</ins><span class="cx"> sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
</span><span class="cx"> get_the_author()
</span><span class="cx"> );
</span><span class="lines">@@ -36,14 +36,14 @@
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <div class="gallery-thumb">
</span><span class="cx"> <a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php
</span><del>- $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);
</del><ins>+ $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 );
</ins><span class="cx"> echo wp_get_attachment_image( $image->ID, 'thumbnail' );
</span><span class="cx"> ?></a>
</span><span class="cx"> </div>
</span><del>- <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"',
</del><ins>+ <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"',
</ins><span class="cx"> $total_images
</span><span class="cx"> ); ?></em></p>
</span><span class="cx">
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> $category_id = get_cat_ID( 'Gallery' );
</span><span class="cx"> $category_link = get_category_link( $category_id );
</span><span class="cx"> ?>
</span><del>- <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e('View posts in the Gallery category', 'twentyten'); ?>"><?php _e('More Galleries', 'twentyten'); ?></a>
</del><ins>+ <a href="<?php echo $category_link; ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
</ins><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span>
</span><span class="cx"> <?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" ); ?>
</span><span class="lines">@@ -77,11 +77,11 @@
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><span class="cx"> <?php
</span><del>- printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
</del><ins>+ printf( __( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten' ),
</ins><span class="cx"> get_permalink(),
</span><span class="cx"> esc_attr( get_the_time() ),
</span><span class="cx"> get_the_date(),
</span><del>- get_author_posts_url( get_the_author_meta('ID') ),
</del><ins>+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
</ins><span class="cx"> sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
</span><span class="cx"> get_the_author()
</span><span class="cx"> );
</span><span class="lines">@@ -95,15 +95,15 @@
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><del>- printf(__( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten'),
</del><ins>+ printf( __( '<span class="meta-prep meta-prep-author">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><span class="entry-date">%3$s</span></a> <span class="meta-sep"> by </span> <span class="author vcard"><a class="url fn n" href="%4$s" title="%5$s">%6$s</a></span>', 'twentyten' ),
</ins><span class="cx"> get_permalink(),
</span><span class="cx"> esc_attr( get_the_time() ),
</span><span class="cx"> get_the_date(),
</span><del>- get_author_posts_url( get_the_author_meta('ID') ),
</del><ins>+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
</ins><span class="cx"> sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
</span><span class="cx"> get_the_author()
</span><span class="cx"> );
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <?php $tags_text = twentyten_tag_list(); ?>
</span><del>- <?php if ( !empty($tags_text) ) : ?>
</del><ins>+ <?php if ( ! empty( $tags_text ) ) : ?>
</ins><span class="cx"> <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span>
</span><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <?php endif; //$tags_text ?>
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( $wp_query->max_num_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><del>-<?php endif; ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php endif; ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytenonecolumnpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/onecolumn-page.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/onecolumn-page.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/onecolumn-page.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php the_content(); ?>
</span><del>- <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
</del><ins>+ <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</ins><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="lines">@@ -25,4 +25,4 @@
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytenpagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/page.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/page.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/page.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php the_content(); ?>
</span><del>- <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>'); ?>
</del><ins>+ <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</ins><span class="cx"> <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx"> </div><!-- #post-<?php the_ID(); ?> -->
</span><span class="lines">@@ -20,4 +20,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/search.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><del>- <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>'); ?></h1>
</del><ins>+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
</ins><span class="cx"> <?php get_generic_template( 'loop', 'search' ); ?>
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <div id="post-0" class="post no-results not-found">
</span><span class="lines">@@ -19,4 +19,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar-footer.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/sidebar-footer.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -1,11 +1,13 @@
</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><del>-<?php if ( is_active_sidebar('first-footer-widget-area') ) : ?>
</del><ins>+<?php if ( is_active_sidebar( 'first-footer-widget-area' ) ) : ?>
</ins><span class="cx"> <div id="first" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><span class="cx"> <?php dynamic_sidebar( 'first-footer-widget-area' ); ?>
</span><span class="lines">@@ -13,7 +15,7 @@
</span><span class="cx"> </div><!-- #first .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php if ( is_active_sidebar('second-footer-widget-area') ) : ?>
</del><ins>+<?php if ( is_active_sidebar( 'second-footer-widget-area' ) ) : ?>
</ins><span class="cx"> <div id="second" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><span class="cx"> <?php dynamic_sidebar( 'second-footer-widget-area' ); ?>
</span><span class="lines">@@ -21,7 +23,7 @@
</span><span class="cx"> </div><!-- #second .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php if ( is_active_sidebar('third-footer-widget-area') ) : ?>
</del><ins>+<?php if ( is_active_sidebar( 'third-footer-widget-area' ) ) : ?>
</ins><span class="cx"> <div id="third" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><span class="cx"> <?php dynamic_sidebar( 'third-footer-widget-area' ); ?>
</span><span class="lines">@@ -29,7 +31,7 @@
</span><span class="cx"> </div><!-- #third .widget-area -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php if ( is_active_sidebar('fourth-footer-widget-area') ) : ?>
</del><ins>+<?php if ( is_active_sidebar( 'fourth-footer-widget-area' ) ) : ?>
</ins><span class="cx"> <div id="fourth" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><span class="cx"> <?php dynamic_sidebar( 'fourth-footer-widget-area' ); ?>
</span><span class="lines">@@ -38,4 +40,4 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #footer-widget-area -->
</span><del>-<?php endif; ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php endif; ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/sidebar.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <div id="primary" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><del>-<?php if ( !dynamic_sidebar('primary-widget-area') ) : // begin primary widget area ?>
</del><ins>+<?php if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : // begin primary widget area ?>
</ins><span class="cx"> <li id="search" class="widget-container widget_search">
</span><span class="cx"> <?php get_search_form(); ?>
</span><span class="cx"> </li>
</span><span class="lines">@@ -24,10 +24,10 @@
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #primary .widget-area -->
</span><span class="cx">
</span><del>-<?php if ( is_active_sidebar('secondary-widget-area') ) : // Nothing here by default and design ?>
</del><ins>+<?php if ( is_active_sidebar( 'secondary-widget-area' ) ) : // Nothing here by default and design ?>
</ins><span class="cx"> <div id="secondary" class="widget-area">
</span><span class="cx"> <ul class="xoxo">
</span><span class="cx"> <?php dynamic_sidebar( 'secondary-widget-area' ); ?>
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- #secondary .widget-area -->
</span><del>-<?php endif; ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php endif; ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/single.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -15,7 +15,7 @@
</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 by ', 'twentyten' ); ?></span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php the_author(); ?></a></span>
</ins><span class="cx"> <span class="meta-sep"><?php _e( ' on ', 'twentyten' ); ?> </span>
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php the_time(); ?>" rel="bookmark"><span class="entry-date"><?php echo get_the_date(); ?></span></a>
</span><span class="cx"> <?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" ); ?>
</span><span class="lines">@@ -26,16 +26,16 @@
</span><span class="cx"> <?php wp_link_pages( 'before=<div class="page-link">' . __( 'Pages:', 'twentyten' ) . '&after=</div>' ); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><del>-<?php if ( get_the_author_meta('description') ) : // If a user has filled out their decscription show a bio on their entries ?>
</del><ins>+<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their decscription show a bio on their entries ?>
</ins><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 id="author-link">
</span><del>- <a href="<?php echo get_author_posts_url( get_the_author_meta('ID') ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
</del><ins>+ <a href="<?php echo get_author_posts_url( get_the_author_meta( 'ID' ) ); ?>" title="<?php printf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ); ?>"><?php _e( 'View all posts by ', 'twentyten' ); ?><?php the_author(); ?> &rarr;</a>
</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">@@ -51,10 +51,10 @@
</span><span class="cx"> }
</span><span class="cx"> printf(
</span><span class="cx"> $utility_text,
</span><del>- get_the_category_list(', '),
</del><ins>+ get_the_category_list( ', ' ),
</ins><span class="cx"> $tag_list,
</span><span class="cx"> get_permalink(),
</span><del>- the_title_attribute('echo=0'),
</del><ins>+ the_title_attribute( 'echo=0' ),
</ins><span class="cx"> get_post_comments_feed_link()
</span><span class="cx"> );
</span><span class="cx"> ?>
</span><span class="lines">@@ -74,4 +74,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13719 => 13720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-03-16 19:20:10 UTC (rev 13719)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-03-16 20:17:22 UTC (rev 13720)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <?php the_post(); ?>
</span><span class="cx">
</span><span class="cx"> <h1 class="page-title"><?php
</span><del>- printf(__( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title('', false) . '</span>');
</del><ins>+ printf( __( 'Tag Archives: %s', 'twentyten' ), '<span>' . single_tag_title( '', false ) . '</span>' );
</ins><span class="cx"> ?></h1>
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="lines">@@ -17,4 +17,4 @@
</span><span class="cx"> </div><!-- #container -->
</span><span class="cx">
</span><span class="cx"> <?php get_sidebar(); ?>
</span><del>-<?php get_footer(); ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+<?php get_footer(); ?>
</ins></span></pre>
</div>
</div>
</body>
</html>