Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-24 13:54:59 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Partial revert of [44636].

Browse Source 
Unrelated changes in `wp-includes/general-template.php` were accidentally committed.

See #44502.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44469 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2019-01-17 07:57:52 +00:00
parent 173e0f9ee7
commit e96ea8eab6
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1693,9 +1693,8 @@ function get_archives_link( $url, $text, $format = 'html', $before = '', $after
* @param string $format Link format. Can be 'link', 'option', 'html', or custom.
* @param string $before Content to prepend to the description.
* @param string $after Content to append to the description.
* @param bool $selected True if the current page is the selected archive
*/
return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after, $selected );
return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after );
}
/**
@ -1821,9 +1820,7 @@ function wp_get_archives( $args = '' ) {
if ( $r['show_post_count'] ) {
$r['after'] = ' (' . $result->posts . ')' . $after;
}
$selected = is_archive() && ( string ) $r[ 'year' ] === $result->year
&& ( string ) $r[ 'monthnum' ] === $result->month;
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
}
}
} elseif ( 'yearly' == $r['type'] ) {
@ -1845,8 +1842,7 @@ function wp_get_archives( $args = '' ) {
if ( $r['show_post_count'] ) {
$r['after'] = ' (' . $result->posts . ')' . $after;
}
$selected = is_archive() && ( string ) $r[ 'year' ] === $result->year;
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
}
}
} elseif ( 'daily' == $r['type'] ) {
@ -1869,10 +1865,7 @@ function wp_get_archives( $args = '' ) {
if ( $r['show_post_count'] ) {
$r['after'] = ' (' . $result->posts . ')' . $after;
}
$selected = is_archive() && ( string ) $r[ 'year' ] === $result->year
&& ( string ) $r[ 'monthnum' ] === $result->month
&& ( string ) $r[ 'day' ] === $result->dayofmonth;
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
}
}
} elseif ( 'weekly' == $r['type'] ) {
@ -1908,9 +1901,7 @@ function wp_get_archives( $args = '' ) {
if ( $r['show_post_count'] ) {
$r['after'] = ' (' . $result->posts . ')' . $after;
}
$selected = is_archive() && ( string ) $r[ 'year' ] === $result->yr
&& ( string ) $r[ 'week' ] === $result->week;
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
}
}
}
@ -1933,8 +1924,7 @@ function wp_get_archives( $args = '' ) {
} else {
$text = $result->ID;
}
$selected = $result->ID === get_the_ID();
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
}
}
}

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.1-beta1-44637';
$wp_version = '5.1-beta1-44638';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.