diff --git a/header.php b/header.php index 55bd1631..aef91adf 100644 --- a/header.php +++ b/header.php @@ -12,27 +12,7 @@ -<?php - /* - * Print the <title> tag based on what is being viewed. - */ - global $page, $paged; - - 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', '_s' ), max( $paged, $page ) ); - - ?> +<?php wp_title( '|', true, 'right' ); ?> -
\ No newline at end of file +
diff --git a/inc/extras.php b/inc/extras.php index 03e8de91..72fb96c8 100644 --- a/inc/extras.php +++ b/inc/extras.php @@ -49,4 +49,31 @@ function _s_enhanced_image_navigation( $url, $id ) { return $url; } -add_filter( 'attachment_link', '_s_enhanced_image_navigation', 10, 2 ); \ No newline at end of file +add_filter( 'attachment_link', '_s_enhanced_image_navigation', 10, 2 ); + +/** + * Filters wp_title to print a neat tag based on what is being viewed. + * + * @since _s 1.1 + */ +function _s_wp_title( $title, $sep ) { + global $page, $paged; + + if ( is_feed() ) + return $title; + + // Add the blog name + $title .= get_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() ) ) + $title .= " $sep $site_description"; + + // Add a page number if necessary: + if ( $paged >= 2 || $page >= 2 ) + $title .= " $sep " . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) ); + + return $title; +} +add_filter( 'wp_title', '_s_wp_title', 10, 2 ); \ No newline at end of file