Changeset 36168

Timestamp:

01/04/2016 05:15:31 PM (9 years ago)

Author:

obenland

Message:

Template: Always display the site title on the front page.

Limits using the page title to the blog page when the site has a static front page,
bringing it N’Sync with wp_title().

Props peterwilsoncc.
Fixes #34962.

Location:

trunk

Files:

• src/wp-includes/general-template.php (modified) (3 diffs)
• tests/phpunit/tests/general/document-title.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -857 +857 @@
         $title['title'] = sprintf( __( 'Search Results for “%s”' ), get_search_query() );
 
-    // If on the home or front page, use the site title.
-    } elseif ( is_home() && is_front_page() ) {
+    // If on the front page, use the site title.
+    } elseif ( is_front_page() ) {
         $title['title'] = get_bloginfo( 'name', 'display' );
 
@@ -870 +870 @@
 
     /*
-     * If we're on the blog page and that page is not the homepage or a single
-     * page that is designated as the homepage, use the container page's title.
-     */
-    } elseif ( ( is_home() && ! is_front_page() ) || ( ! is_home() && is_front_page() ) ) {
-        $title['title'] = single_post_title( '', false );
-
-    // If on a single post of any post type, use the post title.
-    } elseif ( is_singular() ) {
+     * If we're on the blog page that is not the homepage or
+     * a single post of any post type, use the post title.
+     */
+    } elseif ( is_home() || is_singular() ) {
         $title['title'] = single_post_title( '', false );
 
@@ -905 +901 @@
 
     // Append the description or site title to give context.
-    if ( is_home() && is_front_page() ) {
+    if ( is_front_page() ) {
         $title['tagline'] = get_bloginfo( 'description', 'display' );
     } else {

trunk/tests/phpunit/tests/general/document-title.php

@@ -80 +80 @@
     function test_front_page_title() {
         update_option( 'show_on_front', 'page' );
-        update_option( 'page_for_posts', $this->factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
         update_option( 'page_on_front', $this->factory->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
-
-        $this->go_to( '/' );
-
-        $this->assertEquals( sprintf( 'front-page – %s', $this->blog_name ), wp_get_document_title() );
+        add_filter( 'document_title_parts', array( $this, '_front_page_title_parts' ) );
+
+        $this->go_to( '/' );
+        $this->assertEquals( sprintf( '%s – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
 
         update_option( 'show_on_front', 'posts' );
-    }
-
-    function test_home_title() {
-        $this->go_to( '/' );
-
-        add_filter( 'document_title_parts', array( $this, '_home_title_parts' ) );
-
+
+        $this->go_to( '/' );
         $this->assertEquals( sprintf( '%s – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
     }
 
-    function _home_title_parts( $parts ) {
+    function _front_page_title_parts( $parts ) {
         $this->assertArrayHasKey( 'title', $parts );
         $this->assertArrayHasKey( 'tagline', $parts );
@@ -104 +98 @@
 
         return $parts;
+    }
+
+    function test_home_title() {
+        $blog_page_id = $this->factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) );
+        update_option( 'show_on_front', 'page' );
+        update_option( 'page_for_posts', $blog_page_id );
+
+        // Show page name on home page if it's not the front page.
+        $this->go_to( get_permalink( $blog_page_id ) );
+        $this->assertEquals( sprintf( 'blog-page – %s', $this->blog_name ), wp_get_document_title() );
     }