diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 061ebef6fd..a24c5b91c2 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -1693,8 +1693,9 @@ 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 ); + return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after, $selected ); } /** @@ -1820,7 +1821,9 @@ function wp_get_archives( $args = '' ) { if ( $r['show_post_count'] ) { $r['after'] = ' (' . $result->posts . ')' . $after; } - $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['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 ); } } } elseif ( 'yearly' == $r['type'] ) { @@ -1842,7 +1845,8 @@ function wp_get_archives( $args = '' ) { if ( $r['show_post_count'] ) { $r['after'] = ' (' . $result->posts . ')' . $after; } - $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] ); + $selected = is_archive() && ( string ) $r[ 'year' ] === $result->year; + $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected ); } } } elseif ( 'daily' == $r['type'] ) { @@ -1865,7 +1869,10 @@ function wp_get_archives( $args = '' ) { if ( $r['show_post_count'] ) { $r['after'] = ' (' . $result->posts . ')' . $after; } - $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['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 ); } } } elseif ( 'weekly' == $r['type'] ) { @@ -1901,7 +1908,9 @@ function wp_get_archives( $args = '' ) { if ( $r['show_post_count'] ) { $r['after'] = ' (' . $result->posts . ')' . $after; } - $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['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 ); } } } @@ -1924,7 +1933,8 @@ function wp_get_archives( $args = '' ) { } else { $text = $result->ID; } - $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] ); + $selected = $result->ID === get_the_ID(); + $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected ); } } } diff --git a/wp-includes/post.php b/wp-includes/post.php index 6657e462c4..7e46f698ff 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -507,6 +507,7 @@ function update_attached_file( $attachment_id, $file ) { * The path is relative to the current upload dir. * * @since 2.9.0 + * @access private * * @param string $path Full path to the file. * @return string Relative path on success, unchanged path on failure. @@ -913,6 +914,7 @@ function get_page_statuses() { * Return statuses for privacy requests. * * @since 4.9.6 + * @access private * * @return array */ @@ -2481,6 +2483,7 @@ function unstick_post( $post_id ) { * Return the cache key for wp_count_posts() based on the passed arguments. * * @since 3.9.0 + * @access private * * @param string $type Optional. Post type to retrieve count Default 'post'. * @param string $perm Optional. 'readable' or empty. Default empty. @@ -4903,6 +4906,7 @@ function get_page_hierarchy( &$pages, $page_id = 0 ) { * $children contains parent-children relations * * @since 2.9.0 + * @access private * * @see _page_traverse_name() * diff --git a/wp-includes/version.php b/wp-includes/version.php index 0ae4635eb8..f9626fba74 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-beta1-44635'; +$wp_version = '5.1-beta1-44636'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.