Wordpress 3.0.1

[autoinstalls/wordpress.git] / wp-content / themes / twentyten / header.php

diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index fbd248605585cc6fa4a28df2a80e167620e9da8f..fa4b72791629f1156a2b2ba41cef7604c782535b 100644 (file)
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -15,11 +15,23 @@
 <title><?php
        /*
         * Print the <title> tag based on what is being viewed.
 <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.

         */
         */

+       global $page, $paged;
+

        wp_title( '|', true, 'right' );
 
        wp_title( '|', true, 'right' );
 

+       // Add the blog name.
+       bloginfo( 'name' );
+
+       // Add the blog description for the home/front page.
+       $site_description = get_bloginfo( 'description', 'display' );
+       if ( $site_description && ( is_home() || is_front_page() ) )
+               echo " | $site_description";
+
+       // Add a page number if necessary:
+       if ( $paged >= 2 || $page >= 2 )
+               echo ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
+

        ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
        ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />