<!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>[34686] trunk: Allow `wp_get_archives()` to accept `post_type` as an arg.</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" 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/34686">34686</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/34686","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-29 05:10:10 +0000 (Tue, 29 Sep 2015)</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'>Allow `wp_get_archives()` to accept `post_type` as an arg.
Adds unit test.
Fixes <a href="https://core.trac.wordpress.org/ticket/21596">#21596</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionsgetArchivesphp">trunk/tests/phpunit/tests/functions/getArchives.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 2015-09-29 04:57:02 UTC (rev 34685)
+++ trunk/src/wp-includes/general-template.php 2015-09-29 05:10:10 UTC (rev 34686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,6 +1357,7 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.4.0 $post_type arg was 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">@@ -1383,6 +1384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type bool|int $echo Whether to echo or return the links list. Default 1|true to echo.
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $post_type Post type. Default 'post'.
</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">@@ -1394,10 +1396,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'format' => 'html', 'before' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'after' => '', 'show_post_count' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'echo' => 1, 'order' => 'DESC',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' => 'post'
</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="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type_object = get_post_type_object( $r['post_type'] );
+ if ( ! is_post_type_viewable( $post_type_object ) ) {
+ return;
+ }
+ $r['post_type'] = $post_type_object->name;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' == $r['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $r['type'] = 'monthly';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1439,7 +1448,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $sql_where Portion of SQL query containing the WHERE clause.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $r An array of default arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = apply_filters( 'getarchives_where', "WHERE post_type = 'post' AND post_status = 'publish'", $r );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $r['post_type'] );
+ $where = apply_filters( 'getarchives_where', $sql_where, $r );
</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"> * Filter the SQL JOIN clause for retrieving archives.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1473,6 +1483,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $after = $r['after'];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $results as $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_month_link( $result->year, $result->month );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $r['post_type'] ) {
+ $url = add_query_arg( 'post_type', $r['post_type'], $url );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: month name, 2: 4-digit year */
</span><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['show_post_count'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1493,6 +1506,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $after = $r['after'];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $results as $result) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_year_link( $result->year );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $r['post_type'] ) {
+ $url = add_query_arg( 'post_type', $r['post_type'], $url );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = sprintf( '%d', $result->year );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1512,6 +1528,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $after = $r['after'];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $results as $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_day_link( $result->year, $result->month, $result->dayofmonth );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $r['post_type'] ) {
+ $url = add_query_arg( 'post_type', $r['post_type'], $url );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = mysql2date( $archive_day_date_format, $date );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $r['show_post_count'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1540,6 +1559,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $arc_week_start = date_i18n( $archive_week_start_date_format, $arc_week['start'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $arc_week_end = date_i18n( $archive_week_end_date_format, $arc_week['end'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $r['post_type'] ) {
+ $url = add_query_arg( 'post_type', $r['post_type'], $url );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = $arc_week_start . $archive_week_separator . $arc_week_end;
</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></pre></div>
<a id="trunktestsphpunittestsfunctionsgetArchivesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions/getArchives.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/getArchives.php 2015-09-29 04:57:02 UTC (rev 34685)
+++ trunk/tests/phpunit/tests/functions/getArchives.php 2015-09-29 05:10:10 UTC (rev 34686)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,4 +88,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> EOF;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected['order_desc'], trim( wp_get_archives( array( 'echo' => false, 'order' => 'DESC' ) ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 21596
+ */
+ function test_wp_get_archives_post_type() {
+ register_post_type( 'taco', array( 'public' => true ) );
+
+ $this->factory->post->create( array(
+ 'post_type' => 'taco',
+ 'post_author' => '1',
+ 'post_date' => '2014-10-23 19:34:42'
+ ) );
+
+ $oct_url = esc_url( add_query_arg( 'post_type', 'taco', get_month_link( 2014, 10 ) ) );
+ $expected = "<li><a href='{$oct_url}'>October 2014</a></li>";
+ $archives = wp_get_archives( array( 'echo' => false, 'post_type' => 'taco' ) );
+ $this->assertEquals( $expected, trim( $archives ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>