<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16792] trunk/wp-includes: Set queried object on CPT archives.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16792">16792</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-08 08:57:38 +0000 (Wed, 08 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set queried object on CPT archives. Fixes <a href="http://trac.wordpress.org/ticket/15730">#15730</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (16791 => 16792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-12-08 08:50:24 UTC (rev 16791)
+++ trunk/wp-includes/general-template.php 2010-12-08 08:57:38 UTC (rev 16792)
</span><span class="lines">@@ -667,8 +667,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_post_type_object( get_query_var( 'post_type' ) );
</del><ins>+ $post_type_obj = get_queried_object();
</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></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16791 => 16792)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-12-08 08:50:24 UTC (rev 16791)
+++ trunk/wp-includes/query.php 2010-12-08 08:57:38 UTC (rev 16792)
</span><span class="lines">@@ -2675,6 +2675,8 @@
</span><span class="cx"> $this->queried_object = $term;
</span><span class="cx"> $this->queried_object_id = (int) $term->term_id;
</span><span class="cx"> }
</span><ins>+ } elseif ( $this->is_post_type_archive ) {
+ $this->queried_object = get_post_type_object( $this->get('post_type') );
</ins><span class="cx"> } elseif ( $this->is_posts_page ) {
</span><span class="cx"> $page_for_posts = get_option('page_for_posts');
</span><span class="cx"> $this->queried_object = & get_page( $page_for_posts );
</span></span></pre>
</div>
</div>
</body>
</html>