<!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>[28534] trunk/src/wp-includes/general-template.php: Fix some bad UI recursion in `wp_get_archives()` caused by [28379].</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/28534">28534</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-20 23:08:23 +0000 (Tue, 20 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix some bad UI recursion in `wp_get_archives()` caused by <a href="http://core.trac.wordpress.org/changeset/28379">[28379]</a>. It appears that `$afterafter` was appropriately named.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/general-template.php (28533 => 28534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/general-template.php 2014-05-19 17:40:08 UTC (rev 28533)
+++ trunk/src/wp-includes/general-template.php 2014-05-20 23:08:23 UTC (rev 28534)
</span><span class="lines">@@ -1261,12 +1261,13 @@
</span><span class="cx"> }
</span><span class="cx"> if ( $results ) {
</span><span class="cx"> $after = $r['after'];
</span><ins>+ $afterafter = $r['after'];
</ins><span class="cx"> foreach ( (array) $results as $result ) {
</span><span class="cx"> $url = get_month_link( $result->year, $result->month );
</span><span class="cx"> /* translators: 1: month name, 2: 4-digit year */
</span><span class="cx"> $text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
</span><span class="cx"> if ( $r['show_post_count'] ) {
</span><del>- $after = ' ('.$result->posts.')' . $after;
</del><ins>+ $after = ' ('.$result->posts.')' . $afterafter;
</ins><span class="cx"> }
</span><span class="cx"> $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
</span><span class="cx"> }
</span><span class="lines">@@ -1281,13 +1282,14 @@
</span><span class="cx"> }
</span><span class="cx"> if ( $results ) {
</span><span class="cx"> $after = $r['after'];
</span><ins>+ $afterafter = $r['after'];
</ins><span class="cx"> foreach ( (array) $results as $result) {
</span><span class="cx"> $url = get_year_link( $result->year );
</span><span class="cx"> $text = sprintf( '%d', $result->year );
</span><span class="cx"> if ( $r['show_post_count'] ) {
</span><del>- $r['after'] = ' ('.$result->posts.')' . $after;
</del><ins>+ $after = ' ('.$result->posts.')' . $afterafter;
</ins><span class="cx"> }
</span><del>- $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
</del><ins>+ $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } elseif ( 'daily' == $r['type'] ) {
</span><span class="lines">@@ -1301,12 +1303,13 @@
</span><span class="cx"> }
</span><span class="cx"> if ( $results ) {
</span><span class="cx"> $after = $r['after'];
</span><ins>+ $afterafter = $r['after'];
</ins><span class="cx"> foreach ( (array) $results as $result ) {
</span><span class="cx"> $url = get_day_link( $result->year, $result->month, $result->dayofmonth );
</span><span class="cx"> $date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
</span><span class="cx"> $text = mysql2date( $archive_day_date_format, $date );
</span><span class="cx"> if ( $r['show_post_count'] ) {
</span><del>- $after = ' (' . $result->posts . ')' . $after;
</del><ins>+ $after = ' (' . $result->posts . ')' . $afterafter;
</ins><span class="cx"> }
</span><span class="cx"> $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
</span><span class="cx"> }
</span><span class="lines">@@ -1321,8 +1324,9 @@
</span><span class="cx"> wp_cache_set( $key, $results, 'posts' );
</span><span class="cx"> }
</span><span class="cx"> $arc_w_last = '';
</span><del>- $after = $r['after'];
</del><span class="cx"> if ( $results ) {
</span><ins>+ $after = $r['after'];
+ $afterafter = $r['after'];
</ins><span class="cx"> foreach ( (array) $results as $result ) {
</span><span class="cx"> if ( $result->week != $arc_w_last ) {
</span><span class="cx"> $arc_year = $result->yr;
</span><span class="lines">@@ -1333,7 +1337,7 @@
</span><span class="cx"> $url = sprintf( '%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week );
</span><span class="cx"> $text = $arc_week_start . $archive_week_separator . $arc_week_end;
</span><span class="cx"> if ( $r['show_post_count'] ) {
</span><del>- $after = ' (' . $result->posts . ')' . $after;
</del><ins>+ $after = ' (' . $result->posts . ')' . $afterafter;
</ins><span class="cx"> }
</span><span class="cx"> $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>