<!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>[13112] trunk/wp-content/themes/twentyten: Whitespace cleanup, TwentyTen <
title> standardisation & gettext.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13112">13112</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-13 13:35:03 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace cleanup, TwentyTen <title> standardisation & gettext. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a></pre>
<h3>Modified Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/functions.php (13111 => 13112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-02-13 11:20:56 UTC (rev 13111)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-02-13 13:35:03 UTC (rev 13112)
</span><span class="lines">@@ -46,16 +46,12 @@
</span><span class="cx"> if ( is_readable($locale_file) )
</span><span class="cx"> require_once($locale_file);
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> // Get the page number
</span><span class="cx"> function get_page_number() {
</span><span class="cx"> if ( get_query_var('paged') )
</span><del>- print ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
-} // end get_page_number
</del><ins>+ echo ' | ' . __( 'Page ' , 'twentyten') . get_query_var('paged');
+}
</ins><span class="cx">
</span><del>-
-
</del><span class="cx"> // Control excerpt length
</span><span class="cx"> function new_excerpt_length($length) {
</span><span class="cx"> return 40;
</span><span class="lines">@@ -63,7 +59,6 @@
</span><span class="cx"> add_filter('excerpt_length', 'new_excerpt_length');
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Make a nice read more link on excerpts
</span><span class="cx"> function new_excerpt_more($more) {
</span><span class="cx"> return '&nbsp;&hellip; <a href="'. get_permalink() . '">' . 'Continue&nbsp;reading&nbsp;<span class="meta-nav">&rarr;</span>' . '</a>';
</span><span class="lines">@@ -71,7 +66,6 @@
</span><span class="cx"> add_filter('excerpt_more', 'new_excerpt_more');
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Template for comments and pingbacks
</span><span class="cx"> function twentyten_comment($comment, $args, $depth) {
</span><span class="cx"> $GLOBALS ['comment'] = $comment; ?>
</span><span class="lines">@@ -79,7 +73,7 @@
</span><span class="cx"> <li <?php comment_class(); ?> id="li-comment-<?php comment_ID() ?>">
</span><span class="cx"> <div id="comment-<?php comment_ID(); ?>">
</span><span class="cx"> <div class="comment-author vcard">
</span><del>- <?php echo get_avatar($comment,$size='40'); ?>
</del><ins>+ <?php echo get_avatar($comment, 40); ?>
</ins><span class="cx">
</span><span class="cx"> <?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()) ?>
</span><span class="cx"> </div>
</span><span class="lines">@@ -88,7 +82,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 htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),' ','') ?></div>
</del><ins>+ <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()) ?></a><?php edit_comment_link(__('(Edit)'),' ','') ?></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">@@ -103,32 +97,24 @@
</span><span class="cx"> <?php }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> // Make the Visual Editor styles match the theme's styles
</span><del>- add_filter('mce_css', 'my_editor_style');
- function my_editor_style($url) {
</del><ins>+function my_editor_style($url) {
+ if ( !empty($url) )
+ $url .= ',';
</ins><span class="cx">
</span><del>- if ( !empty($url) )
- $url .= ',';
-
</del><span class="cx"> // Change the path here if using sub-directory
</span><span class="cx"> $url .= trailingslashit( get_stylesheet_directory_uri() ) . 'editor-style.css';
</span><span class="cx">
</span><span class="cx"> return $url;
</span><span class="cx"> }
</span><ins>+add_filter('mce_css', 'my_editor_style');
</ins><span class="cx">
</span><del>-
-
</del><span class="cx"> // Remove inline styles on gallery shortcode
</span><del>-
</del><span class="cx"> function remove_gallery_css() {
</span><span class="cx"> return "<div class='gallery'>";
</span><span class="cx"> }
</span><span class="cx"> add_filter('gallery_style', 'remove_gallery_css');
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> // For category lists on category archives: Returns other categories except the current one (redundant)
</span><span class="cx"> function cats_meow($glue) {
</span><span class="cx"> $current_cat = single_cat_title( '', false );
</span><span class="lines">@@ -146,8 +132,6 @@
</span><span class="cx"> return trim(join( $glue, $cats ));
</span><span class="cx"> } // end cats_meow
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> // For tag lists on tag archives: Returns other tags except the current one (redundant)
</span><span class="cx"> function tag_ur_it($glue) {
</span><span class="cx"> $current_tag = single_tag_title( '', '', false );
</span><span class="lines">@@ -165,7 +149,6 @@
</span><span class="cx"> return trim(join( $glue, $tags ));
</span><span class="cx"> } // end tag_ur_it
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Register widgetized areas
</span><span class="cx"> function theme_widgets_init() {
</span><span class="cx"> // Area 1
</span><span class="lines">@@ -236,7 +219,5 @@
</span><span class="cx">
</span><span class="cx"> } // end theme_widgets_init
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> // Add all the groovy widget areas
</span><del>-add_action( 'init', 'theme_widgets_init' );
</del><ins>+add_action( 'init', 'theme_widgets_init' );
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (13111 => 13112)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-02-13 11:20:56 UTC (rev 13111)
+++ trunk/wp-content/themes/twentyten/header.php 2010-02-13 13:35:03 UTC (rev 13112)
</span><span class="lines">@@ -2,12 +2,19 @@
</span><span class="cx"> <html <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span><span class="cx"> <title><?php
</span><del>- if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); }
- elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); }
- elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); }
- elseif ( is_search() ) { print 'Search results for ' . esc_html($s); get_page_number(); print ' | '; bloginfo('name'); }
- elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); }
- else { bloginfo('name'); wp_title('|'); get_page_number(); }
</del><ins>+ if ( is_single() ) {
+ single_post_title(); echo ' | '; bloginfo('name');
+ } elseif ( is_home() || is_front_page() ) {
+ bloginfo('name'); echo ' | '; bloginfo('description'); get_page_number();
+ } elseif ( is_page() ) {
+ single_post_title(''); echo ' | '; bloginfo('name');
+ } elseif ( is_search() ) {
+ printf(__('Search results for "%s"', 'twentyten'), esc_html($s)); get_page_number(); echo ' | '; bloginfo('name');
+ } elseif ( is_404() ) {
+ _e('Not Found', 'twentyten'); echo ' | '; bloginfo('name');
+ } else {
+ wp_title(''); echo ' | '; bloginfo('name'); get_page_number();
+ }
</ins><span class="cx"> ?></title>
</span><span class="cx">
</span><span class="cx"> <meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
</span></span></pre>
</div>
</div>
</body>
</html>