From e96ea8eab6eed07e59331669dc504926cea2de71 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <gary@pento.net>
Date: Thu, 17 Jan 2019 07:57:52 +0000
Subject: [PATCH] Docs: Partial revert of [44636].

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
---
 wp-includes/general-template.php | 22 ++++++----------------
 wp-includes/version.php          |  2 +-
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index a24c5b91c2..061ebef6fd 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -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'] = '&nbsp;(' . $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'] = '&nbsp;(' . $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'] = '&nbsp;(' . $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'] = '&nbsp;(' . $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'] );
 				}
 			}
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9d994ab11d..64da076dd3 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -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.