<!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>[25312] trunk: Move checks for `post_type` being an array inline.</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/25312">25312</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-10 03:01:10 +0000 (Tue, 10 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move checks for `post_type` being an array inline. See <a href="http://core.trac.wordpress.org/changeset/25291">[25291]</a>, <a href="http://core.trac.wordpress.org/changeset/25292">[25292]</a>, <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="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.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 (25311 => 25312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/general-template.php 2013-09-10 02:35:26 UTC (rev 25311)
+++ trunk/src/wp-includes/general-template.php 2013-09-10 03:01:10 UTC (rev 25312)
</span><span class="lines">@@ -579,7 +579,10 @@
</span><span class="cx">
</span><span class="cx"> // If there's a post type archive
</span><span class="cx"> if ( is_post_type_archive() ) {
</span><del>- $post_type_object = get_post_type_object( get_query_var( 'post_type' ) );
</del><ins>+ $post_type = get_query_var( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+ $post_type_object = get_post_type_object( $post_type );
</ins><span class="cx"> if ( ! $post_type_object->has_archive )
</span><span class="cx"> $title = post_type_archive_title( '', false );
</span><span class="cx"> }
</span><span class="lines">@@ -706,7 +709,11 @@
</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 = get_query_var( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+
+ $post_type_obj = get_post_type_object( $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">@@ -1689,7 +1696,11 @@
</span><span class="cx"> $href = get_post_comments_feed_link( $post->ID );
</span><span class="cx"> }
</span><span class="cx"> } elseif ( is_post_type_archive() ) {
</span><del>- $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) );
</del><ins>+ $post_type = get_query_var( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+
+ $post_type_obj = get_post_type_object( $post_type );
</ins><span class="cx"> $title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
</span><span class="cx"> $href = get_post_type_archive_feed_link( $post_type_obj->name );
</span><span class="cx"> } elseif ( is_category() ) {
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/post.php (25311 => 25312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/post.php 2013-09-10 02:35:26 UTC (rev 25311)
+++ trunk/src/wp-includes/post.php 2013-09-10 03:01:10 UTC (rev 25312)
</span><span class="lines">@@ -1058,9 +1058,6 @@
</span><span class="cx"> function get_post_type_object( $post_type ) {
</span><span class="cx"> global $wp_post_types;
</span><span class="cx">
</span><del>- if ( is_array( $post_type ) )
- $post_type = reset( $post_type );
-
</del><span class="cx"> if ( empty($wp_post_types[$post_type]) )
</span><span class="cx"> return null;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/query.php (25311 => 25312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/query.php 2013-09-10 02:35:26 UTC (rev 25311)
+++ trunk/src/wp-includes/query.php 2013-09-10 03:01:10 UTC (rev 25312)
</span><span class="lines">@@ -3076,7 +3076,10 @@
</span><span class="cx"> _make_cat_compat( $this->queried_object );
</span><span class="cx"> }
</span><span class="cx"> } elseif ( $this->is_post_type_archive ) {
</span><del>- $this->queried_object = get_post_type_object( $this->get('post_type') );
</del><ins>+ $post_type = $this->get( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+ $this->queried_object = get_post_type_object( $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_post( $page_for_posts );
</span><span class="lines">@@ -3152,7 +3155,10 @@
</span><span class="cx"> if ( empty( $post_types ) || ! $this->is_post_type_archive )
</span><span class="cx"> return (bool) $this->is_post_type_archive;
</span><span class="cx">
</span><del>- $post_type_object = get_post_type_object( $this->get( 'post_type' ) );
</del><ins>+ $post_type = $this->get( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+ $post_type_object = get_post_type_object( $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="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/template.php (25311 => 25312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/template.php 2013-09-10 02:35:26 UTC (rev 25311)
+++ trunk/src/wp-includes/template.php 2013-09-10 03:01:10 UTC (rev 25312)
</span><span class="lines">@@ -80,7 +80,11 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_post_type_archive_template() {
</span><del>- $obj = get_post_type_object( get_query_var( 'post_type' ) );
</del><ins>+ $post_type = get_query_var( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+
+ $obj = get_post_type_object( $post_type );
</ins><span class="cx"> if ( ! $obj->has_archive )
</span><span class="cx"> return '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsqueryconditionalsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/query/conditionals.php (25311 => 25312)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/query/conditionals.php 2013-09-10 02:35:26 UTC (rev 25311)
+++ trunk/tests/phpunit/tests/query/conditionals.php 2013-09-10 03:01:10 UTC (rev 25312)
</span><span class="lines">@@ -699,16 +699,12 @@
</span><span class="cx"> $this->go_to( "/$cpt_name/" );
</span><span class="cx"> $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
</span><span class="cx"> $this->assertEquals( get_queried_object(), get_post_type_object( $cpt_name ) );
</span><del>- $this->assertEquals( get_queried_object(), get_post_type_object( array( $cpt_name ) ) );
- $this->assertEquals( get_queried_object(), get_post_type_object( array( $cpt_name, 'post' ) ) );
</del><span class="cx">
</span><span class="cx"> add_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_type_array' ) );
</span><span class="cx">
</span><span class="cx"> $this->go_to( "/$cpt_name/" );
</span><span class="cx"> $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
</span><span class="cx"> $this->assertEquals( get_queried_object(), get_post_type_object( 'post' ) );
</span><del>- $this->assertEquals( get_queried_object(), get_post_type_object( array( 'post' ) ) );
- $this->assertEquals( get_queried_object(), get_post_type_object( array( 'post', $cpt_name ) ) );
</del><span class="cx">
</span><span class="cx"> remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_with_type_array' ) );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>