<!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>[15195] trunk/wp-content/themes/twentyten: Use wp_title()
proper in Twenty Ten, and move the janky stuff to a filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15195">15195</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-10 18:26:53 +0000 (Thu, 10 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use wp_title() proper in Twenty Ten, and move the janky stuff to a filter. see <a href="http://trac.wordpress.org/ticket/13751">#13751</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 (15194 => 15195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/functions.php 2010-06-10 18:23:08 UTC (rev 15194)
+++ trunk/wp-content/themes/twentyten/functions.php 2010-06-10 18:26:53 UTC (rev 15195)
</span><span class="lines">@@ -191,35 +191,71 @@
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> /* Shows the same border as on front end */
</span><span class="cx"> #headimg {
</span><del>- border-bottom: 1px solid #000000;
- border-top: 4px solid #000000;
</del><ins>+ border-bottom: 1px solid #000;
+ border-top: 4px solid #000;
</ins><span class="cx"> }
</span><del>-
-/* If NO_HEADER_TEXT is false, you can style here the header text preview */
-#headimg #name {
-}
-
-#headimg #desc {
-}
</del><ins>+/* If NO_HEADER_TEXT is false, you would style the text with these selectors:
+ #headimg #name { }
+ #headimg #desc { }
+*/
</ins><span class="cx"> </style>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>-if ( ! function_exists( 'twentyten_the_page_number' ) ) :
</del><span class="cx"> /**
</span><del>- * Prints the page number currently being browsed, with a vertical bar before it.
</del><ins>+ * Makes some changes to the <title> tag, by filtering the output of wp_title().
</ins><span class="cx"> *
</span><del>- * Used in Twenty Ten's header.php to add the page number to the <title> HTML tag.
</del><ins>+ * If we have a site description and we're viewing the home page or a blog posts
+ * page (when using a static front page), then we will add the site description.
</ins><span class="cx"> *
</span><ins>+ * If we're viewing a search result, then we're going to recreate the title entirely.
+ * We're going to add page numbers to all titles as well, to the middle of a search
+ * result title and the end of all other titles.
+ *
+ * The site title also gets added to all titles.
+ *
</ins><span class="cx"> * @since Twenty Ten 1.0
</span><ins>+ *
+ * @param string $title Title generated by wp_title()
+ * @param string $separator The separator passed to wp_title(). Twenty Ten uses a
+ * vertical bar, "|", as a separator in header.php.
+ * @return string The new title, ready for the <title> tag.
</ins><span class="cx"> */
</span><del>-function twentyten_the_page_number() {
- global $paged; // Contains page number.
- if ( $paged >= 2 )
- echo ' | ' . sprintf( __( 'Page %s', 'twentyten' ), $paged );
</del><ins>+function twentyten_filter_wp_title( $title, $separator ) {
+ // The $paged global variable contains the page number of a listing of posts.
+ // The $page global variable contains the page number of a single post that is paged.
+ // We'll display whichever one applies, if we're not looking at the first page.
+ global $paged, $page;
+
+ if ( is_search() ) {
+ // If we're a search, let's start over:
+ $title = sprintf( __( 'Search results for %s', 'twentyten' ), '"' . get_search_query() . '"' );
+ // Add a page number if we're on page 2 or more:
+ if ( $paged >= 2 )
+ $title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), $paged );
+ // Add the site name to the end:
+ $title .= " $separator " . get_bloginfo( 'name', 'display' );
+ // We're done. Let's send the new title back to wp_title():
+ return $title;
+ }
+
+ // Otherwise, let's start by adding the site name to the end:
+ $title .= get_bloginfo( 'name', 'display' );
+
+ // If we have a site description and we're on the home/front page, add the description:
+ $site_description = get_bloginfo( 'description', 'display' );
+ if ( $site_description && ( is_home() || is_front_page() ) )
+ $title .= " $separator " . $site_description;
+
+ // Add a page number if necessary:
+ if ( $paged >= 2 || $page >= 2 )
+ $title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
+
+ // Return the new title to wp_title():
+ return $title;
</ins><span class="cx"> }
</span><del>-endif;
</del><ins>+add_filter( 'wp_title', 'twentyten_filter_wp_title', 10, 2 );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/header.php (15194 => 15195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/header.php 2010-06-10 18:23:08 UTC (rev 15194)
+++ trunk/wp-content/themes/twentyten/header.php 2010-06-10 18:26:53 UTC (rev 15195)
</span><span class="lines">@@ -11,31 +11,19 @@
</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' ); ?>" />
- <title>
- <?php // Returns the title based on what is being viewed
- if ( is_single() ) { // single posts
- single_post_title(); echo ' | '; bloginfo( 'name' );
- // The home page or, if using a static front page, the blog posts page.
- } elseif ( is_home() || is_front_page() ) {
- bloginfo( 'name' );
- if( get_bloginfo( 'description' ) )
- echo ' | ' ; bloginfo( 'description' );
- twentyten_the_page_number();
- } elseif ( is_page() ) { // WordPress Pages
- single_post_title( '' ); echo ' | '; bloginfo( 'name' );
- } elseif ( is_search() ) { // Search results
- printf( __( 'Search results for %s', 'twentyten' ), '"'.get_search_query().'"' ); twentyten_the_page_number(); echo ' | '; bloginfo( 'name' );
- } elseif ( is_404() ) { // 404 (Not Found)
- _e( 'Not Found', 'twentyten' ); echo ' | '; bloginfo( 'name' );
- } else { // Otherwise:
- wp_title( '' ); echo ' | '; bloginfo( 'name' ); twentyten_the_page_number();
- }
- ?>
- </title>
- <link rel="profile" href="http://gmpg.org/xfn/11" />
- <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
- <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</del><ins>+<meta charset="<?php bloginfo( 'charset' ); ?>" />
+<title><?php
+ /*
+ * Print the <title> tag based on what is being viewed.
+ * We filter the output of wp_title() a bit -- see
+ * twentyten_filter_wp_title() in functions.php.
+ */
+ wp_title( '|', true, 'right' );
+
+ ?></title>
+<link rel="profile" href="http://gmpg.org/xfn/11" />
+<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
+<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
</ins><span class="cx"> <?php
</span><span class="cx"> /* We add some JavaScript to pages with the comment form
</span><span class="cx"> * to support sites with threaded comments (when in use).
</span><span class="lines">@@ -48,7 +36,6 @@
</span><span class="cx"> * generally use this hook to add elements to <head> such
</span><span class="cx"> * as styles, scripts, and meta tags.
</span><span class="cx"> */
</span><del>-
</del><span class="cx"> wp_head();
</span><span class="cx"> ?>
</span><span class="cx"> </head>
</span></span></pre>
</div>
</div>
</body>
</html>