WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set the proper value for `wp_title()` when `is_author()` and `is_post_type_archive()` are both true. `post_type` should always win due to the precedence indicated in `get_queried_object()`. 

Props mordauk.
Fixes #25398.


Built from https://develop.svn.wordpress.org/trunk@28251


git-svn-id: http://core.svn.wordpress.org/trunk@28079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-04 22:21:22 +00:00
parent 2c97f4640b
commit a2067a7324
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/general-template.php
View File

@ -794,7 +794,7 @@ function wp_title($sep = '»', $display = true, $seplocation = '') {
} }
// If there's an author // If there's an author
if ( is_author() ) { if ( is_author() && ! is_post_type_archive() ) {
$author = get_queried_object(); $author = get_queried_object();
if ( $author ) if ( $author )
$title = $author->display_name; $title = $author->display_name;
@ -1977,7 +1977,7 @@ function the_weekday() {
* *
* @since 0.71 * @since 0.71
* *
* @param string $the_weekday * @param string $the_weekday
*/ */
$the_weekday = apply_filters( 'the_weekday', $the_weekday ); $the_weekday = apply_filters( 'the_weekday', $the_weekday );
echo $the_weekday; echo $the_weekday;
@ -2009,7 +2009,7 @@ function the_weekday_date($before='',$after='') {
* *
* @since 0.71 * @since 0.71
* *
* @param string $the_weekday_date * @param string $the_weekday_date
* @param string $before The HTML to output before the date. * @param string $before The HTML to output before the date.
* @param string $after The HTML to output after the date. * @param string $after The HTML to output after the date.
*/ */
@ -2410,10 +2410,10 @@ function language_attributes($doctype = 'html') {
* It is possible to add query vars to the link by using the 'add_args' argument * It is possible to add query vars to the link by using the 'add_args' argument
* and see {@link add_query_arg()} for more information. * and see {@link add_query_arg()} for more information.
* *
* The 'before_page_number' and 'after_page_number' arguments allow users to * The 'before_page_number' and 'after_page_number' arguments allow users to
* augment the links themselves. Typically this might be to add context to the * augment the links themselves. Typically this might be to add context to the
* numbered links so that screen reader users understand what the links are for. * numbered links so that screen reader users understand what the links are for.
* The text strings are added before and after the page number - within the * The text strings are added before and after the page number - within the
* anchor tag. * anchor tag.
* *
* @since 2.1.0 * @since 2.1.0