Changeset 28534

Timestamp:

05/20/2014 11:08:23 PM (7 years ago)

Author:

wonderboymusic

Message:

Fix some bad UI recursion in wp_get_archives() caused by [28379]. It appears that $afterafter was appropriately named.

See #22400.

File:

• trunk/src/wp-includes/general-template.php (modified) (7 diffs)

trunk/src/wp-includes/general-template.php

@@ -1262 +1262 @@
         if ( $results ) {
             $after = $r['after'];
+            $afterafter = $r['after'];
             foreach ( (array) $results as $result ) {
                 $url = get_month_link( $result->year, $result->month );
@@ -1267 +1268 @@
                 $text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
                 if ( $r['show_post_count'] ) {
-                    $after = ' ('.$result->posts.')' . $after;
+                    $after = ' ('.$result->posts.')' . $afterafter;
                 }
                 $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
@@ -1282 +1283 @@
         if ( $results ) {
             $after = $r['after'];
+            $afterafter = $r['after'];
             foreach ( (array) $results as $result) {
                 $url = get_year_link( $result->year );
                 $text = sprintf( '%d', $result->year );
                 if ( $r['show_post_count'] ) {
-                    $r['after'] = ' ('.$result->posts.')' . $after;
+                    $after = ' ('.$result->posts.')' . $afterafter;
                 }
-                $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+                $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
             }
         }
@@ -1302 +1304 @@
         if ( $results ) {
             $after = $r['after'];
+            $afterafter = $r['after'];
             foreach ( (array) $results as $result ) {
                 $url    = get_day_link( $result->year, $result->month, $result->dayofmonth );
@@ -1307 +1310 @@
                 $text = mysql2date( $archive_day_date_format, $date );
                 if ( $r['show_post_count'] ) {
-                    $after = ' (' . $result->posts . ')' . $after;
+                    $after = ' (' . $result->posts . ')' . $afterafter;
                 }
                 $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );
@@ -1322 +1325 @@
         }
         $arc_w_last = '';
-        $after = $r['after'];
         if ( $results ) {
+                $after = $r['after'];
+                $afterafter = $r['after'];
                 foreach ( (array) $results as $result ) {
                     if ( $result->week != $arc_w_last ) {
@@ -1334 +1338 @@
                         $text = $arc_week_start . $archive_week_separator . $arc_week_end;
                         if ( $r['show_post_count'] ) {
-                            $after = ' (' . $result->posts . ')' . $after;
+                            $after = ' (' . $result->posts . ')' . $afterafter;
                         }
                         $output .= get_archives_link( $url, $text, $r['format'], $r['before'], $after );