Changeset 35706 for trunk/src/wp-includes/general-template.php

Timestamp:

11/19/2015 05:08:33 PM (10 years ago)

Author:

obenland

Message:

Template: Use template-loader.php as cononical source of truth for conditional ordering.

Reverts [35700] which didn't account for author archives without posts.
Determination of the correct title is now based on the same order of
conditionals that template loader uses to select the right template.

H/t ocean90.
Fixes #34516.

File:

• trunk/src/wp-includes/general-template.php (modified) (4 diffs)

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

@@ -848 +848 @@
     );
 
-    // If on the home or front page, use the site title.
-    if ( is_home() && is_front_page() ) {
-        $title['title'] = get_bloginfo( 'name', 'display' );
-
-    /*
-     * 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() ) {
-        $title['title'] = single_post_title( '', false );
-
-    // If on a category or tag or taxonomy archive, use the archive title.
-    } elseif ( is_category() || is_tag() || is_tax() ) {
-        $title['title'] = single_term_title( '', false );
+    // If it's a 404 page, use a "Page not found" title.
+    if ( is_404() ) {
+        $title['title'] = __( 'Page not found' );
 
     // If it's a search, use a dynamic search results title.
@@ -872 +857 @@
         $title['title'] = sprintf( __( 'Search Results for “%s”' ), get_search_query() );
 
-    // If on an author archive, use the author's display name.
-    } elseif ( is_author() ) {
-        $title['title'] = get_the_author();
+    // If on the home or front page, use the site title.
+    } elseif ( is_home() && is_front_page() ) {
+        $title['title'] = get_bloginfo( 'name', 'display' );
 
     // If on a post type archive, use the post type archive title.
@@ -880 +865 @@
         $title['title'] = post_type_archive_title( '', false );
 
+    // If on a taxonomy archive, use the term title.
+    } elseif ( is_tax() ) {
+        $title['title'] = single_term_title( '', false );
+
+    /*
+     * 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() ) {
+        $title['title'] = single_post_title( '', false );
+
+    // If on a category or tag archive, use the term title.
+    } elseif ( is_category() || is_tag() ) {
+        $title['title'] = single_term_title( '', false );
+
+    // If on an author archive, use the author's display name.
+    } elseif ( is_author() && $author = get_queried_object() ) {
+        $title['title'] = $author->display_name;
+
     // If it's a date archive, use the date as the title.
     } elseif ( is_year() ) {
@@ -889 +897 @@
     } elseif ( is_day() ) {
         $title['title'] = get_the_date();
-
-    // If it's a 404 page, use a "Page not found" title.
-    } elseif ( is_404() ) {
-        $title['title'] = __( 'Page not found' );
     }