<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[44897] trunk/src/wp-includes: Widgets: Pre-select currently viewed archive in the Archives dropdown widget, for consistency with the Categories widget.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/44897">44897</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/44897","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-03-14 19:30:59 +0000 (Thu, 14 Mar 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Widgets: Pre-select currently viewed archive in the Archives dropdown widget, for consistency with the Categories widget.
Props robobot3000, audrasjb, afercia, Themonic.
Fixes <a href="https://core.trac.wordpress.org/ticket/40662">#40662</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetarchivesphp">trunk/src/wp-includes/widgets/class-wp-widget-archives.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2019-03-14 17:38:36 UTC (rev 44896)
+++ trunk/src/wp-includes/general-template.php 2019-03-14 19:30:59 UTC (rev 44897)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1660,14 +1660,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $url URL to archive.
- * @param string $text Archive text description.
- * @param string $format Optional, default is 'html'. Can be 'link', 'option', 'html', or custom.
- * @param string $before Optional. Content to prepend to the description. Default empty.
- * @param string $after Optional. Content to append to the description. Default empty.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $url URL to archive.
+ * @param string $text Archive text description.
+ * @param string $format Optional, default is 'html'. Can be 'link', 'option', 'html', or custom.
+ * @param string $before Optional. Content to prepend to the description. Default empty.
+ * @param string $after Optional. Content to append to the description. Default empty.
+ * @param bool $selected Optional. Set to true if the current page is the selected archive page.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string HTML link content for archive.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function get_archives_link( $url, $text, $format = 'html', $before = '', $after = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function get_archives_link( $url, $text, $format = 'html', $before = '', $after = '', $selected = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = wptexturize( $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = esc_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1674,7 +1675,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'link' == $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'option' == $format ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link_html = "\t<option value='$url'>$before $text $after</option>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected_attr = $selected ? " selected='selected'" : '';
+ $link_html = "\t<option value='$url'$selected_attr>$before $text $after</option>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'html' == $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_html = "\t<li>$before<a href='$url'>$text</a>$after</li>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // custom
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1686,6 +1688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Added the `$url`, `$text`, `$format`, `$before`, and `$after` parameters.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.0 Added the `$selected` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $link_html The archive HTML link content.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $url URL to archive.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1693,8 +1696,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $format Link format. Can be 'link', 'option', 'html', or custom.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $before Content to prepend to the description.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $after Content to append to the description.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $selected True if the current page is the selected archive.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after, $selected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1701,7 +1705,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Display archive links based on type and format.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.4.0 $post_type arg was added.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.4.0 The `$post_type` argument was added.
+ * @since 5.2.0 The `$year`, `$monthnum`, `$day`, and `$w` arguments were added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see get_archives_link()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1729,6 +1734,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $order Whether to use ascending or descending order. Accepts 'ASC', or 'DESC'.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'DESC'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $post_type Post type. Default 'post'.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $year Year. Default current year.
+ * @type string $monthnum Month number. Default current month number.
+ * @type string $day Day. Default current day.
+ * @type string $w Week. Default current week.
</ins><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|void String when retrieving.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1745,6 +1754,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'post',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'year' => get_query_var( 'year' ),
+ 'monthnum' => get_query_var( 'monthnum' ),
+ 'day' => get_query_var( 'day' ),
+ 'w' => get_query_var( 'w' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1820,7 +1833,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['show_post_count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['after'] = ' (' . $result->posts . ')' . $after;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'yearly' == $r['type'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1842,7 +1856,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['show_post_count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['after'] = ' (' . $result->posts . ')' . $after;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = is_archive() && (string) $r['year'] === $result->year;
+ $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'daily' == $r['type'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1865,7 +1880,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['show_post_count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['after'] = ' (' . $result->posts . ')' . $after;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'weekly' == $r['type'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1901,7 +1917,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['show_post_count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['after'] = ' (' . $result->posts . ')' . $after;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = is_archive() && (string) $r['year'] === $result->yr && (string) $r['w'] === $result->week;
+ $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1924,7 +1941,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = $result->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = $result->ID === get_the_ID();
+ $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'], $selected );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetarchivesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-archives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-archives.php 2019-03-14 17:38:36 UTC (rev 44896)
+++ trunk/src/wp-includes/widgets/class-wp-widget-archives.php 2019-03-14 19:30:59 UTC (rev 44897)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dropdown_id = "{$this->id_base}-dropdown-{$this->number}";
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="screen-reader-text" for="<?php echo esc_attr( $dropdown_id ); ?>"><?php echo $title; ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <select id="<?php echo esc_attr( $dropdown_id ); ?>" name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <select id="<?php echo esc_attr( $dropdown_id ); ?>" name="archive-dropdown">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the arguments for the Archives widget drop-down.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,6 +104,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_get_archives( $dropdown_args ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<script type='text/javascript'>
+/* <![CDATA[ */
+(function() {
+ var dropdown = document.getElementById( "<?php echo esc_js( $dropdown_id ); ?>" );
+ function onSelectChange() {
+ if ( dropdown.options[ dropdown.selectedIndex ].value !== '' ) {
+ document.location.href = this.options[ this.selectedIndex ].value;
+ }
+ }
+ dropdown.onchange = onSelectChange;
+})();
+/* ]]> */
+</script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>