<!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>[13029] trunk/wp-content/themes/twentyten: Escape some attributes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13029">13029</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-02-08 20:28:13 +0000 (Mon, 08 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Escape some attributes. Fix search form action. see <a href="http://trac.wordpress.org/ticket/9015">#9015</a></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="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.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="#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 (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -27,14 +27,14 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</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( __('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"> <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 the_time( get_option( 'date_format' ) ); ?></span></a>
</del><ins>+ the_permalink(); ?>" title="<?php echo esc_attr( get_the_time('Y-m-d\TH:i:sO') ); ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</ins><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenattachmentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/attachment.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/attachment.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/attachment.php 2010-02-08 20:28:13 UTC (rev 13029)
</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>- <p class="page-title"><a href="<?php echo get_permalink($post->post_parent) ?>" title="<?php printf( __( 'Return to %s', 'twentyten' ), wp_specialchars( 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' ), wp_specialchars( 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><span class="cx"> <span class="meta-prep meta-prep-author"><?php _e('By ', 'twentyten'); ?></span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx"> <span class="meta-prep meta-prep-entry-date"><?php _e('Published ', 'twentyten'); ?></span>
</span><span class="cx"> <span class="entry-date"><abbr class="published" title="<?php the_time('Y-m-d\TH:i:sO') ?>"><?php the_time( get_option( 'date_format' ) ); ?></abbr></span>
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <div class="entry-attachment">
</span><span class="cx"> <?php if ( wp_attachment_is_image( $post->id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?>
</span><del>- <p class="attachment"><a href="<?php echo wp_get_attachment_url($post->id); ?>" title="<?php the_title(); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>" class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a>
</del><ins>+ <p class="attachment"><a href="<?php echo wp_get_attachment_url($post->id); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><img src="<?php echo $att_image[0];?>" width="<?php echo $att_image[1];?>" height="<?php echo $att_image[2];?>" class="attachment-medium" alt="<?php $post->post_excerpt; ?>" /></a>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -31,7 +31,7 @@
</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 wp_specialchars( get_the_title($post->ID), 1 ) ?>" rel="attachment"><?php echo basename($post->guid) ?></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($post->guid) ?></a>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="entry-caption"><?php if ( !empty($post->post_excerpt) ) the_excerpt() ?></div>
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> the_title_attribute('echo=0'),
</span><span class="cx"> comments_rss() ) ?>
</span><span class="cx">
</span><del>-<?php if ( ('open' == $post->comment_status) && ('open' == $post->ping_status) ) : // Comments and trackbacks open ?>
</del><ins>+<?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
</ins><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 ( !('open' == $post->comment_status) && ('open' == $post->ping_status) ) : // 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 ( ('open' == $post->comment_status) && !('open' == $post->ping_status) ) : // 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 ( !('open' == $post->comment_status) && !('open' == $post->ping_status) ) : // 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></pre></div>
<a id="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/author.php 2010-02-08 20:28:13 UTC (rev 13029)
</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>- <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='$authordata->display_name' rel='me'>$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="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</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( __('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"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/category.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -21,14 +21,14 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</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( __('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"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/comments.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/comments.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/comments.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -74,17 +74,17 @@
</span><span class="cx">
</span><span class="cx"> <div id="form-section-author" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="author"><?php _e('Name', 'twentyten') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'twentyten') ?></div>
</span><del>- <div class="form-input"><input id="author" name="author" type="text" value="<?php echo $comment_author ?>" size="30" tabindex="3" /></div>
</del><ins>+ <div class="form-input"><input id="author" name="author" type="text" value="<?php echo esc_attr($comment_author) ?>" size="30" tabindex="3" /></div>
</ins><span class="cx"> </div><!-- #form-section-author .form-section -->
</span><span class="cx">
</span><span class="cx"> <div id="form-section-email" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="email"><?php _e('Email', 'twentyten') ?></label> <?php if ($req) _e('<span class="required">*</span>', 'twentyten') ?></div>
</span><del>- <div class="form-input"><input id="email" name="email" type="text" value="<?php echo $comment_author_email ?>" size="30" tabindex="4" /></div>
</del><ins>+ <div class="form-input"><input id="email" name="email" type="text" value="<?php echo esc_attr($comment_author_email) ?>" size="30" tabindex="4" /></div>
</ins><span class="cx"> </div><!-- #form-section-email .form-section -->
</span><span class="cx">
</span><span class="cx"> <div id="form-section-url" class="form-section">
</span><span class="cx"> <div class="form-label"><label for="url"><?php _e('Website', 'twentyten') ?></label></div>
</span><del>- <div class="form-input"><input id="url" name="url" type="text" value="<?php echo $comment_author_url ?>" size="30" tabindex="5" /></div>
</del><ins>+ <div class="form-input"><input id="url" name="url" type="text" value="<?php echo esc_attr($comment_author_url) ?>" size="30" tabindex="5" /></div>
</ins><span class="cx"> </div><!-- #form-section-url .form-section -->
</span><span class="cx">
</span><span class="cx"> <?php endif; // if ( $user_ID ) ?>
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span><span class="cx">
</span><del>- <div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php _e('Post Comment', 'twentyten') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /></div>
</del><ins>+ <div class="form-submit"><input id="submit" name="submit" type="submit" value="<?php esc_attr_e('Post Comment', 'twentyten') ?>" tabindex="7" /><input type="hidden" name="comment_post_ID" value="<?php echo esc_attr($id); ?>" /></div>
</ins><span class="cx">
</span><span class="cx"> <?php comment_id_fields(); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/footer.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/footer.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/footer.php 2010-02-08 20:28:13 UTC (rev 13029)
</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 bloginfo( 'url' ) ?>/" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a>
</del><ins>+ <a href="<?php bloginfo( '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="' . __( '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 (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -49,9 +49,8 @@
</span><span class="cx">
</span><span class="cx"> // Get the page number
</span><span class="cx"> function get_page_number() {
</span><del>- if ( get_query_var('paged') ) {
</del><ins>+ if ( get_query_var('paged') )
</ins><span class="cx"> print ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
</span><del>- }
</del><span class="cx"> } // end get_page_number
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -66,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> // Make a nice read more link on excerpts
</span><span class="cx"> function new_excerpt_more($more) {
</span><del>-return '&nbsp;&hellip; <a href="'. get_permalink($post->ID) . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
</del><ins>+ return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> add_filter('excerpt_more', 'new_excerpt_more');
</span><span class="cx">
</span><span class="lines">@@ -124,8 +123,8 @@
</span><span class="cx">
</span><span class="cx"> function remove_gallery_css() {
</span><span class="cx"> return "<div class='gallery'>";
</span><del>- }
- add_filter('gallery_style', 'remove_gallery_css');
</del><ins>+}
+add_filter('gallery_style', 'remove_gallery_css');
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -240,5 +239,3 @@
</span><span class="cx">
</span><span class="cx"> // Add all the groovy widget areas
</span><span class="cx"> add_action( 'init', 'theme_widgets_init' );
</span><del>-
-
</del></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/header.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -20,8 +20,8 @@
</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( __( '%s latest posts', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
- <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( __( '%s latest comments', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
</del><ins>+ <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('rss2_url'); ?>" title="<?php printf( esc_attr__( '%s latest posts', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
+ <link rel="alternate" type="application/rss+xml" href="<?php bloginfo('comments_rss2_url') ?>" title="<?php printf( esc_attr__( '%s latest comments', 'twentyten' ), wp_specialchars( get_bloginfo('name'), 1 ) ); ?>" />
</ins><span class="cx"> <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
</span><span class="cx"> </head>
</span><span class="cx">
</span><span class="lines">@@ -32,7 +32,7 @@
</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 bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
</del><ins>+ <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>
</ins><span class="cx"> <div id="site-description"><?php bloginfo( 'description' ) ?></div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="lines">@@ -45,7 +45,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 _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 (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/index.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -13,20 +13,20 @@
</span><span class="cx"> <?php if ( have_posts() ) : 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( __('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"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span><span class="cx"> <div class="gallery-thumb"><a class="size-thumbnail" href="<?php permalink_link() ?>"><?php $hilite = $wpdb->get_var( "SELECT ID FROM $wpdb->posts WHERE post_parent = '$post->ID' AND post_type = 'attachment' LIMIT 1" ); echo wp_get_attachment_image( $hilite, 'thumbnail' );?></a></div>
</span><span class="cx">
</span><del>- <p><em><?php printf( __('This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( __('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = '$post->ID' AND post_type = 'attachment'" )); ?></em></p>
</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"', $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_parent = '$post->ID' AND post_type = 'attachment'" )); ?></em></p>
</ins><span class="cx">
</span><span class="cx"> <?php the_excerpt(''); ?>
</span><span class="cx"> </div><!-- .entry-content -->
</span><span class="lines">@@ -36,7 +36,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 _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><span class="cx"> <span class="meta-sep"> | </span>
</span><span class="cx">
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</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">@@ -68,14 +68,14 @@
</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( __('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"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n"2 href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <span class="author vcard"><a class="url fn n"2 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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-content">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/search.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post() ?>
</span><span class="cx">
</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( __('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"> <?php if ( $post->post_type == 'post' ) { ?>
</span><span class="cx"> <div class="entry-meta">
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/searchform.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/searchform.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/searchform.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><del>- <form id="searchform" name="searchform" method="get" action="/">
</del><ins>+ <form id="searchform" name="searchform" method="get" action="<?php echo home_url(); ?>">
</ins><span class="cx"> <div>
</span><span class="cx"> <label for="s"><?php _e('Search', 'twentyten'); ?></label>
</span><span class="cx"> <input type="text" id="s" name="s" />
</span><del>- <input type="submit" id="searchsubmit" value="<?php _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="trunkwpcontentthemestwentytensinglephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/single.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/single.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/single.php 2010-02-08 20:28:13 UTC (rev 13029)
</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( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> <span class="meta-sep"> <?php _e('on ', 'twentyten'); ?> </span>
</span><span class="cx"> <a href="<?php
</span><span class="cx"> the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> <h2><?php _e('About ', 'twentyten'); ?><?php the_author(); ?></h2>
</span><span class="cx"> <?php the_author_meta('description'); ?>
</span><span class="cx"> <div id="author-link">
</span><del>- <a href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( '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, $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>
</ins><span class="cx"> </div><!-- #author-link -->
</span><span class="cx"> </div><!-- #author-description -->
</span><span class="cx"> </div><!-- .entry-author-info -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13028 => 13029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-02-08 18:27:02 UTC (rev 13028)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-02-08 20:28:13 UTC (rev 13029)
</span><span class="lines">@@ -19,13 +19,13 @@
</span><span class="cx"> <?php while ( have_posts() ) : the_post(); ?>
</span><span class="cx">
</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( __('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"> <span class="meta-prep meta-prep-author"><?php _e('Posted on ', 'twentyten'); ?></span>
</span><span class="cx"> <a href="<?php the_permalink(); ?>" title="<?php the_time('Y-m-d\TH:i:sO') ?>" rel="bookmark"><span class="entry-date"><?php the_time( get_option( 'date_format' ) ); ?></span></a>
</span><span class="cx"> <span class="meta-sep"> <?php _e('by ', 'twentyten'); ?> </span>
</span><del>- <span class="author vcard"><a class="url fn n" href="<?php echo get_author_posts_url( $authordata->ID, $authordata->user_nicename ); ?>" title="<?php printf( __( 'View all posts by %s', 'twentyten' ), $authordata->display_name ); ?>"><?php the_author(); ?></a></span>
</del><ins>+ <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>
</ins><span class="cx"> </div><!-- .entry-meta -->
</span><span class="cx">
</span><span class="cx"> <div class="entry-summary">
</span></span></pre>
</div>
</div>
</body>
</html>