Changeset 45817

Timestamp:

08/16/2019 12:23:40 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: In feed_links_extra() and get_the_archive_title(), make sure the queried taxonomy term exists before accessing its properties.

Props donmhico, truchot, zaantar.
Fixes #46420.

File:

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

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

@@ -1555 +1555 @@
  */
 function get_the_archive_title() {
+    $title = __( 'Archives' );
+
     if ( is_category() ) {
         /* translators: Category archive title. %s: Category name */
@@ -1597 +1599 @@
         $title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
     } elseif ( is_tax() ) {
-        $tax = get_taxonomy( get_queried_object()->taxonomy );
-        /* translators: Taxonomy term archive title. 1: Taxonomy singular name, 2: Current taxonomy term */
-        $title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
-    } else {
-        $title = __( 'Archives' );
+        $queried_object = get_queried_object();
+        if ( $queried_object ) {
+            $tax = get_taxonomy( $queried_object->taxonomy );
+            /* translators: Taxonomy term archive title. 1: Taxonomy singular name, 2: Current taxonomy term */
+            $title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
+        }
     }
 
@@ -2909 +2912 @@
         }
     } elseif ( is_tax() ) {
-        $term  = get_queried_object();
-        $tax   = get_taxonomy( $term->taxonomy );
-        $title = sprintf( $args['taxtitle'], get_bloginfo( 'name' ), $args['separator'], $term->name, $tax->labels->singular_name );
-        $href  = get_term_feed_link( $term->term_id, $term->taxonomy );
+        $term = get_queried_object();
+
+        if ( $term ) {
+            $tax   = get_taxonomy( $term->taxonomy );
+            $title = sprintf( $args['taxtitle'], get_bloginfo( 'name' ), $args['separator'], $term->name, $tax->labels->singular_name );
+            $href  = get_term_feed_link( $term->term_id, $term->taxonomy );
+        }
     } elseif ( is_author() ) {
         $author_id = intval( get_query_var( 'author' ) );