Notice being displayed in page title on taxonomy archive pages

[ZaneMatthew]

I'm receiving a PHP notice on custom taxonomy archive pages (or when ever is_tax() is set to true). It appears that the line ​#543 in general-template.php should have an additional check for the $term thats being used.

Below is the code in question:

if ( is_tax() ) {		
	$tax = get_taxonomy( $term->taxonomy );
	$title = single_term_title( $tax->labels->name . $t_sep, false );
}

And this is my current local fix:

if ( is_tax() && $term = get_queried_object() && ! empty( $term ) ) {
    $tax = get_taxonomy( $term->taxonomy );
    $title = single_term_title( $tax->labels->name . $t_sep, false );
}

thoughts?

[wonderboymusic]

Check it now, it does

[SergeyBiryukov]

Duplicate of #21394.