<!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>[25291] trunk: Ensure that the post type object is the queried object when a post type has been registered with `has_archive => true`.</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/25291">25291</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-06 22:06:40 +0000 (Fri, 06 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure that the post type object is the queried object when a post type has been registered with `has_archive => true`. Ensure it is not stomped when decorated with `tax_query`. Adds unit tests.
Props nacin.
Fixes <a href="http://core.trac.wordpress.org/ticket/18614">#18614</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludestemplateloaderphp">trunk/src/wp-includes/template-loader.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunktestsphpunittestsqueryconditionalsphp">trunk/tests/phpunit/tests/query/conditionals.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 (25290 => 25291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/general-template.php 2013-09-06 20:51:09 UTC (rev 25290)
+++ trunk/src/wp-includes/general-template.php 2013-09-06 22:06:40 UTC (rev 25291)
</span><span class="lines">@@ -577,6 +577,13 @@
</span><span class="cx"> $title = single_post_title( '', false );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // If there's a post type archive
+ if ( is_post_type_archive() ) {
+ $post_type_object = get_post_type_object( get_query_var( 'post_type' ) );
+ if ( ! $post_type_object->has_archive )
+ $title = post_type_archive_title( '', false );
+ }
+
</ins><span class="cx"> // If there's a category or tag
</span><span class="cx"> if ( is_category() || is_tag() ) {
</span><span class="cx"> $title = single_term_title( '', false );
</span><span class="lines">@@ -595,8 +602,8 @@
</span><span class="cx"> $title = $author->display_name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If there's a post type archive
- if ( is_post_type_archive() )
</del><ins>+ // Post type archives with has_archive should override terms.
+ if ( is_post_type_archive() && $post_type_object->has_archive )
</ins><span class="cx"> $title = post_type_archive_title( '', false );
</span><span class="cx">
</span><span class="cx"> // If there's a month
</span><span class="lines">@@ -696,7 +703,7 @@
</span><span class="cx"> if ( ! is_post_type_archive() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- $post_type_obj = get_queried_object();
</del><ins>+ $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
</ins><span class="cx"> $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name );
</span><span class="cx">
</span><span class="cx"> if ( $display )
</span><span class="lines">@@ -1670,7 +1677,7 @@
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx">
</span><del>- if ( is_single() || is_page() ) {
</del><ins>+ if ( is_singular() ) {
</ins><span class="cx"> $id = 0;
</span><span class="cx"> $post = get_post( $id );
</span><span class="cx">
</span><span class="lines">@@ -1678,6 +1685,10 @@
</span><span class="cx"> $title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], esc_html( get_the_title() ) );
</span><span class="cx"> $href = get_post_comments_feed_link( $post->ID );
</span><span class="cx"> }
</span><ins>+ } elseif ( is_post_type_archive() ) {
+ $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
+ $title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
+ $href = get_post_type_archive_feed_link( $post_type_obj->name );
</ins><span class="cx"> } elseif ( is_category() ) {
</span><span class="cx"> $term = get_queried_object();
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (25290 => 25291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2013-09-06 20:51:09 UTC (rev 25290)
+++ trunk/src/wp-includes/query.php 2013-09-06 22:06:40 UTC (rev 25291)
</span><span class="lines">@@ -3147,10 +3147,10 @@
</span><span class="cx"> * @return bool
</span><span class="cx"> */
</span><span class="cx"> function is_post_type_archive( $post_types = '' ) {
</span><del>- if ( empty( $post_types ) || !$this->is_post_type_archive )
</del><ins>+ if ( empty( $post_types ) || ! $this->is_post_type_archive )
</ins><span class="cx"> return (bool) $this->is_post_type_archive;
</span><span class="cx">
</span><del>- $post_type_object = $this->get_queried_object();
</del><ins>+ $post_type_object = get_post_type_object( $this->get( 'post_type' ) );
</ins><span class="cx">
</span><span class="cx"> return in_array( $post_type_object->name, (array) $post_types );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpincludestemplateloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/template-loader.php (25290 => 25291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/template-loader.php 2013-09-06 20:51:09 UTC (rev 25290)
+++ trunk/src/wp-includes/template-loader.php 2013-09-06 22:06:40 UTC (rev 25291)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> $template = false;
</span><span class="cx"> if ( is_404() && $template = get_404_template() ) :
</span><span class="cx"> elseif ( is_search() && $template = get_search_template() ) :
</span><ins>+ elseif ( is_post_type_archive() && $template = get_post_type_archive_template() ) :
</ins><span class="cx"> elseif ( is_tax() && $template = get_taxonomy_template() ) :
</span><span class="cx"> elseif ( is_front_page() && $template = get_front_page_template() ) :
</span><span class="cx"> elseif ( is_home() && $template = get_home_template() ) :
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/template.php (25290 => 25291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/template.php 2013-09-06 20:51:09 UTC (rev 25290)
+++ trunk/src/wp-includes/template.php 2013-09-06 22:06:40 UTC (rev 25291)
</span><span class="lines">@@ -73,6 +73,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Retrieve path of post type archive template in current or parent template.
+ *
+ * @since 3.7.0
+ *
+ * @return string
+ */
+function get_post_type_archive_template() {
+ $obj = get_post_type_object( get_query_var( 'post_type' ) );
+ if ( ! $obj->has_archive )
+ return '';
+
+ return get_archive_template();
+}
+
+/**
</ins><span class="cx"> * Retrieve path of author template in current or parent template.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/conditionals.php (25290 => 25291)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/conditionals.php 2013-09-06 20:51:09 UTC (rev 25290)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2013-09-06 22:06:40 UTC (rev 25291)
</span><span class="lines">@@ -648,4 +648,39 @@
</span><span class="cx"> $this->go_to( '/2013/11/41/' );
</span><span class="cx"> $this->assertQueryTrue( 'is_404' );
</span><span class="cx"> }
</span><ins>+
+ function test_post_type_archive_with_tax_query() {
+ delete_option( 'rewrite_rules' );
+
+ $cpt_name = 'ptawtq';
+ register_post_type( $cpt_name, array(
+ 'taxonomies' => array( 'post_tag', 'category' ),
+ 'rewrite' => true,
+ 'has_archive' => true,
+ 'public' => true
+ ) );
+
+ $tag_id = $this->factory->tag->create( array( 'slug' => 'tag-slug' ) );
+ $post_id = $this->factory->post->create( array( 'post_type' => $cpt_name ) );
+ wp_set_object_terms( $post_id, $tag_id, 'post_tag' );
+
+ $this->go_to( '/ptawtq/' );
+ $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
+ $this->assertEquals( get_queried_object(), get_post_type_object( $cpt_name ) );
+
+ add_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_tax_query' ) );
+
+ $this->go_to( '/ptawtq/' );
+ $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
+ $this->assertEquals( get_queried_object(), get_post_type_object( $cpt_name ) );
+
+ remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_tax_query' ) );
+ }
+
+ function pre_get_posts_with_tax_query( &$query ) {
+ $term = get_term_by( 'slug', 'tag-slug', 'post_tag' );
+ $query->set( 'tax_query', array(
+ array( 'taxonomy' => 'post_tag', 'field' => 'term_id', 'terms' => $term->term_id )
+ ) );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>