<!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>[16480] trunk/wp-content/themes/twentyten: Twenty Ten code cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16480">16480</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-19 05:37:47 +0000 (Fri, 19 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Ten code cleanups. props lancewillett, fixes <a href="http://trac.wordpress.org/ticket/15476">#15476</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenarchivephp">trunk/wp-content/themes/twentyten/archive.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="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopattachmentphp">trunk/wp-content/themes/twentyten/loop-attachment.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenloopphp">trunk/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenrtlcss">trunk/wp-content/themes/twentyten/rtl.css</a></li>
<li><a href="#trunkwpcontentthemestwentytensidebarphp">trunk/wp-content/themes/twentyten/sidebar.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 (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> <?php if ( is_day() ) : ?>
</span><span class="cx"> <?php printf( __( 'Daily Archives: <span>%s</span>', 'twentyten' ), get_the_date() ); ?>
</span><span class="cx"> <?php elseif ( is_month() ) : ?>
</span><del>- <?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date('F Y') ); ?>
</del><ins>+ <?php printf( __( 'Monthly Archives: <span>%s</span>', 'twentyten' ), get_the_date( 'F Y' ) ); ?>
</ins><span class="cx"> <?php elseif ( is_year() ) : ?>
</span><del>- <?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date('Y') ); ?>
</del><ins>+ <?php printf( __( 'Yearly Archives: <span>%s</span>', 'twentyten' ), get_the_date( 'Y' ) ); ?>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <?php _e( 'Blog Archives', 'twentyten' ); ?>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -23,17 +23,14 @@
</span><span class="cx"> ?>
</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">
</del><ins>+ <a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
</ins><span class="cx"> <?php bloginfo( 'name' ); ?>
</span><span class="cx"> </a>
</span><span class="cx"> </div><!-- #site-info -->
</span><span class="cx">
</span><span class="cx"> <div id="site-generator">
</span><span class="cx"> <?php do_action( 'twentyten_credits' ); ?>
</span><del>- <a href="<?php echo esc_url( __('http://wordpress.org/', 'twentyten') ); ?>"
- title="<?php esc_attr_e('Semantic Personal Publishing Platform', 'twentyten'); ?>" rel="generator">
- <?php printf( __('Proudly powered by %s.', 'twentyten'), 'WordPress' ); ?>
- </a>
</del><ins>+ <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'twentyten' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyten' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s.', 'twentyten' ), 'WordPress' ); ?></a>
</ins><span class="cx"> </div><!-- #site-generator -->
</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 (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> case 'trackback' :
</span><span class="cx"> ?>
</span><span class="cx"> <li class="post pingback">
</span><del>- <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __('(Edit)', 'twentyten'), ' ' ); ?></p>
</del><ins>+ <p><?php _e( 'Pingback:', 'twentyten' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyten' ), ' ' ); ?></p>
</ins><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> endswitch;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/index.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> *
</span><span class="cx"> * This is the most generic template file in a WordPress theme
</span><span class="cx"> * and one of the two required files for a theme (the other being style.css).
</span><del>- * It is used to display a page when nothing more specific matches a query.
</del><ins>+ * It is used to display a page when nothing more specific matches a query.
</ins><span class="cx"> * E.g., it puts together the home page when no home.php file exists.
</span><span class="cx"> * Learn more: http://codex.wordpress.org/Template_Hierarchy
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop-attachment.php (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop-attachment.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/loop-attachment.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="entry-meta">
</span><span class="cx"> <?php
</span><del>- printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
</del><ins>+ printf( __( '<span class="%1$s">By</span> %2$s', 'twentyten' ),
</ins><span class="cx"> 'meta-prep meta-prep-author',
</span><span class="cx"> sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
</span><span class="cx"> get_author_posts_url( get_the_author_meta( 'ID' ) ),
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <span class="meta-sep">|</span>
</span><span class="cx"> <?php
</span><del>- printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
</del><ins>+ printf( __( '<span class="%1$s">Published</span> %2$s', 'twentyten' ),
</ins><span class="cx"> 'meta-prep meta-prep-entry-date',
</span><span class="cx"> sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
</span><span class="cx"> esc_attr( get_the_time() ),
</span><span class="lines">@@ -50,10 +50,10 @@
</span><span class="cx"> if ( wp_attachment_is_image() ) {
</span><span class="cx"> echo ' <span class="meta-sep">|</span> ';
</span><span class="cx"> $metadata = wp_get_attachment_metadata();
</span><del>- printf( __( 'Full size is %s pixels', 'twentyten'),
</del><ins>+ printf( __( 'Full size is %s pixels', 'twentyten' ),
</ins><span class="cx"> sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
</span><span class="cx"> wp_get_attachment_url(),
</span><del>- esc_attr( __('Link to full-size image', 'twentyten') ),
</del><ins>+ esc_attr( __( 'Link to full-size image', 'twentyten' ) ),
</ins><span class="cx"> $metadata['width'],
</span><span class="cx"> $metadata['height']
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenloopphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/loop.php (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/loop.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/loop.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> <?php /* How to display posts in the Gallery category. */ ?>
</span><span class="cx">
</span><del>- <?php if ( in_category( _x('gallery', 'gallery category slug', 'twentyten') ) || 'gallery' == get_post_format( $post->ID ) ) : ?>
</del><ins>+ <?php if ( in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) || 'gallery' == get_post_format( $post->ID ) ) : ?>
</ins><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><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <?php if ( post_password_required() ) : ?>
</span><span class="cx"> <?php the_content(); ?>
</span><del>-<?php else : ?>
- <?php
</del><ins>+<?php else : ?>
+ <?php
</ins><span class="cx"> $images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
</span><span class="cx"> if ( $images ) :
</span><span class="cx"> $total_images = count( $images );
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-utility">
</span><del>- <a href="<?php echo get_term_link( _x('gallery', 'gallery category slug', 'twentyten'), 'category' ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
</del><ins>+ <a href="<?php echo get_term_link( _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ); ?>" 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> <span class="edit-link">', '</span>' ); ?>
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> <?php /* How to display posts in the asides category */ ?>
</span><span class="cx">
</span><del>- <?php elseif ( in_category( _x('asides', 'asides category slug', 'twentyten') ) || 'aside' == get_post_format( $post->ID ) ) : ?>
</del><ins>+ <?php elseif ( in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) || 'aside' == get_post_format( $post->ID ) ) : ?>
</ins><span class="cx"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenrtlcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/rtl.css (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/rtl.css 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/rtl.css 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><span class="cx"> /* Text elements */
</span><del>-ul {
</del><ins>+ul, ol {
</ins><span class="cx"> margin: 0 1.5em 18px 0;
</span><span class="cx"> }
</span><span class="cx"> blockquote {
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/sidebar.php (16479 => 16480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/sidebar.php 2010-11-19 05:31:07 UTC (rev 16479)
+++ trunk/wp-content/themes/twentyten/sidebar.php 2010-11-19 05:37:47 UTC (rev 16480)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> * some default sidebar stuff just in case.
</span><span class="cx"> */
</span><span class="cx"> if ( ! dynamic_sidebar( 'primary-widget-area' ) ) : ?>
</span><del>-
</del><ins>+
</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></pre>
</div>
</div>
</body>
</html>