Ticket #21394: 21394.2.diff

wp-includes/category-template.php

@@ -467 +467 @@
 
                 if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
                         $current_term_object = get_queried_object();
-                        if ( $r['taxonomy'] == $current_term_object->taxonomy )
+                        if ( $current_term_object && $r['taxonomy'] === $current_term_object->taxonomy )
                                 $r['current_category'] = get_queried_object_id();
                 }
 
@@ -1039 +1039 @@
  * @return string Term description, available.
  */
 function term_description( $term = 0, $taxonomy = 'post_tag' ) {
-        if ( !$term && ( is_tax() || is_tag() || is_category() ) ) {
+        if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) {
                 $term = get_queried_object();
-                $taxonomy = $term->taxonomy;
-                $term = $term->term_id;
+                if ( $term ) {
+                        $taxonomy = $term->taxonomy;
+                        $term = $term->term_id;
+                }
         }
         $description = get_term_field( 'description', $term, $taxonomy );
         return is_wp_error( $description ) ? '' : $description;

wp-includes/general-template.php

@@ -585 +585 @@
         // If there's a taxonomy
         if ( is_tax() ) {
                 $term = get_queried_object();
-                $tax = get_taxonomy( $term->taxonomy );
-                $title = single_term_title( $tax->labels->name . $t_sep, false );
+                if ( $term ) {
+                        $tax = get_taxonomy( $term->taxonomy );
+                        $title = single_term_title( $tax->labels->name . $t_sep, false );
+                }
         }
 
         // If there's an author
         if ( is_author() ) {
                 $author = get_queried_object();
-                $title = $author->display_name;
+                if ( $author )
+                        $title = $author->display_name;
         }
 
         // If there's a post type archive
@@ -696 +699 @@
         if ( ! is_post_type_archive() )
                 return;
 
+        $_title = '';
+
         $post_type_obj = get_queried_object();
-        $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
+        if ( $post_type_obj )
+                $_title = $post_type_obj->labels->name;
+
+        $title = apply_filters( 'post_type_archive_title', $_title );
 
         if ( $display )
                 echo $prefix . $title;
@@ -1681 +1689 @@
         } elseif ( is_category() ) {
                 $term = get_queried_object();
 
-                $title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
-                $href = get_category_feed_link( $term->term_id );
+                if ( $term ) {
+                        $title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
+                        $href = get_category_feed_link( $term->term_id );
+                }
         } elseif ( is_tag() ) {
                 $term = get_queried_object();
 
-                $title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
-                $href = get_tag_feed_link( $term->term_id );
+                if ( $term ) {
+                        $title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
+                        $href = get_tag_feed_link( $term->term_id );
+                }
         } elseif ( is_author() ) {
                 $author_id = intval( get_query_var('author') );
 
@@ -1698 +1710 @@
                 $href = get_search_feed_link();
         } elseif ( is_post_type_archive() ) {
                 $title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
-                $href = get_post_type_archive_feed_link( get_queried_object()->name );
+                $post_type_obj = get_queried_object();
+                if ( $post_type_obj )
+                        $href = get_post_type_archive_feed_link( $post_type_obj->name );
         }
 
         if ( isset($title) && isset($href) )

wp-includes/link-template.php

@@ -713 +713 @@
  * @return string HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-        if ( is_null( $term ) ) {
+        if ( is_null( $term ) )
                 $term = get_queried_object();
-        }
+
+        if ( ! $term )
+                return;
 
         $tax = get_taxonomy( $term->taxonomy );
-        if ( !current_user_can($tax->cap->edit_terms) )
+        if ( ! current_user_can( $tax->cap->edit_terms ) )
                 return;
 
         if ( empty( $link ) )

wp-includes/template.php

@@ -241 +241 @@
         if ( ! $pagename && $id ) {
                 // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
                 $post = get_queried_object();
-                $pagename = $post->post_name;
+                if ( $post )
+                        $pagename = $post->post_name;
         }
 
         $templates = array();