Changeset 21276

Timestamp:

07/18/2012 05:07:15 PM (12 years ago)

Author:

lancewillett

Message:

Twenty Twelve: make title truly pluggable by moving output from header.php to a function. Props obenland, fixes #21233.

Location:

trunk/wp-content/themes/twentytwelve

Files:

• functions.php (modified) (1 diff)
• header.php (modified) (1 diff)

trunk/wp-content/themes/twentytwelve/functions.php

@@ -130 +130 @@
 }
 add_action( 'wp_enqueue_scripts', 'twentytwelve_scripts_styles' );
+
+/**
+ * Creates a nicely formatted and more specific title element text
+ * for output in head of document, based on current view.
+ *
+ * @since Twenty Twelve 1.0
+ */
+function twentytwelve_wp_title( $title, $sep ) {
+    global $paged, $page;
+
+    // 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 = "$title $sep $site_description";
+
+    // Add a page number if necessary.
+    if ( $paged >= 2 || $page >= 2 )
+        $title =  "$title $sep " . sprintf( __( 'Page %s', 'twentytwelve' ), max( $paged, $page ) );
+
+    return $title;
+}
+add_filter( 'wp_title', 'twentytwelve_wp_title', 10, 2 );
 
 /**

trunk/wp-content/themes/twentytwelve/header.php

@@ -14 +14 @@
 <meta charset="<?php bloginfo( 'charset' ); ?>" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<title><?php wp_title( '|', true, 'right' ); ?><?php echo bloginfo( 'name' ); ?></title>
+<title><?php wp_title( '|', true, 'right' ); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11" />
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />