Ticket #21596: 21596.diff

src/wp-includes/general-template.php

@@ -1394 +1394 @@
                 'format' => 'html', 'before' => '',
                 'after' => '', 'show_post_count' => false,
                 'echo' => 1, 'order' => 'DESC',
+                'post_type' => 'post'
         );
 
         $r = wp_parse_args( $args, $defaults );
 
+        $post_type_object = get_post_type_object( $r['post_type'] );
+        if ( ! is_post_type_viewable( $post_type_object ) ) {
+                return;
+        }
+
         if ( '' == $r['type'] ) {
                 $r['type'] = 'monthly';
         }
@@ -1439 +1445 @@
          * @param string $sql_where Portion of SQL query containing the WHERE clause.
          * @param array  $r         An array of default arguments.
          */
-        $where = apply_filters( 'getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
+        $sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $r['post_type'] );
+        $where = apply_filters( 'getarchives_where', $sql_where, $r );
 
         /**
          * Filter the SQL JOIN clause for retrieving archives.
@@ -1473 +1480 @@
                         $after = $r['after'];
                         foreach ( (array) $results as $result ) {
                                 $url = get_month_link( $result->year, $result->month );
+                                if ( 'post' !== $r['post_type'] ) {
+                                        $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                }
                                 /* translators: 1: month name, 2: 4-digit year */
                                 $text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
                                 if ( $r['show_post_count'] ) {
@@ -1493 +1503 @@
                         $after = $r['after'];
                         foreach ( (array) $results as $result) {
                                 $url = get_year_link( $result->year );
+                                if ( 'post' !== $r['post_type'] ) {
+                                        $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                }
                                 $text = sprintf( '%d', $result->year );
                                 if ( $r['show_post_count'] ) {
                                         $r['after'] = ' (' . $result->posts . ')' . $after;
@@ -1512 +1525 @@
                         $after = $r['after'];
                         foreach ( (array) $results as $result ) {
                                 $url  = get_day_link( $result->year, $result->month, $result->dayofmonth );
+                                if ( 'post' !== $r['post_type'] ) {
+                                        $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                }
                                 $date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
                                 $text = mysql2date( $archive_day_date_format, $date );
                                 if ( $r['show_post_count'] ) {
@@ -1540 +1556 @@
                                         $arc_week_start = date_i18n( $archive_week_start_date_format, $arc_week['start'] );
                                         $arc_week_end   = date_i18n( $archive_week_end_date_format, $arc_week['end'] );
                                         $url            = sprintf( '%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&', '=', $result->week );
+                                        if ( 'post' !== $r['post_type'] ) {
+                                                $url = add_query_arg( 'post_type', $r['post_type'], $url );
+                                        }
                                         $text           = $arc_week_start . $archive_week_separator . $arc_week_end;
                                         if ( $r['show_post_count'] ) {
                                                 $r['after'] = ' (' . $result->posts . ')' . $after;