<!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>[26946] branches/3.8: Query: Fix category handling in pre_get_posts when pretty permalinks are in use (category_name query variable).</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/26946">26946</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-15 07:33:23 +0000 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Query: Fix category handling in pre_get_posts when pretty permalinks are in use (category_name query variable).
Merges <a href="http://core.trac.wordpress.org/changeset/26864">[26864]</a> <a href="http://core.trac.wordpress.org/changeset/26874">[26874]</a> <a href="http://core.trac.wordpress.org/changeset/26875">[26875]</a> to the 3.8 branch.
props wonderboymusic, SergeyBiryukov.
fixes <a href="http://core.trac.wordpress.org/ticket/26627">#26627</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches38srcwpincludesqueryphp">branches/3.8/src/wp-includes/query.php</a></li>
<li><a href="#branches38testsphpunittestsquerytaxQueryphp">branches/3.8/tests/phpunit/tests/query/taxQuery.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches38">branches/3.8/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.8
</span><span class="cx">===================================================================
</span><del>--- branches/3.8 2014-01-14 23:34:23 UTC (rev 26945)
</del><ins>+++ branches/3.8 2014-01-15 07:33:23 UTC (rev 26946)
</ins><a id="branches38"></a>
<div class="propset"><h4>Property changes: branches/3.8</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/3.1:18031
</span><span class="cx"> /branches/3.3:20543
</span><span class="cx"> /branches/3.4:21757
</span><del>-/trunk:18512,26885,26924,26935
</del><ins>+/trunk:18512,26864,26874-26875,26885,26924,26935
</ins><span class="cx">\ No newline at end of property
</span><a id="branches38srcwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: branches/3.8/src/wp-includes/query.php (26945 => 26946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/src/wp-includes/query.php 2014-01-14 23:34:23 UTC (rev 26945)
+++ branches/3.8/src/wp-includes/query.php 2014-01-15 07:33:23 UTC (rev 26946)
</span><span class="lines">@@ -3264,17 +3264,24 @@
</span><span class="cx">
</span><span class="cx"> if ( $this->is_category || $this->is_tag || $this->is_tax ) {
</span><span class="cx"> if ( $this->is_category ) {
</span><del>- $term = get_term( $this->get( 'cat' ), 'category' );
</del><ins>+ if ( $this->get( 'cat' ) ) {
+ $term = get_term( $this->get( 'cat' ), 'category' );
+ } elseif ( $this->get( 'category_name' ) ) {
+ $term = get_term_by( 'slug', $this->get( 'category_name' ), 'category' );
+ }
</ins><span class="cx"> } elseif ( $this->is_tag ) {
</span><span class="cx"> $term = get_term( $this->get( 'tag_id' ), 'post_tag' );
</span><span class="cx"> } else {
</span><span class="cx"> $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
</span><span class="cx"> $query = reset( $tax_query_in_and );
</span><span class="cx">
</span><del>- if ( 'term_id' == $query['field'] )
- $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
- else
- $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
</del><ins>+ if ( $query['terms'] ) {
+ if ( 'term_id' == $query['field'] ) {
+ $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
+ } else {
+ $term = get_term_by( $query['field'], reset( $query['terms'] ), $query['taxonomy'] );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $term ) && ! is_wp_error( $term ) ) {
</span></span></pre></div>
<a id="branches38testsphpunittestsquerytaxQueryphp"></a>
<div class="modfile"><h4>Modified: branches/3.8/tests/phpunit/tests/query/taxQuery.php (26945 => 26946)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.8/tests/phpunit/tests/query/taxQuery.php 2014-01-14 23:34:23 UTC (rev 26945)
+++ branches/3.8/tests/phpunit/tests/query/taxQuery.php 2014-01-15 07:33:23 UTC (rev 26946)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx"> protected $post_id;
</span><span class="cx">
</span><span class="cx"> protected $cat;
</span><ins>+ protected $uncat;
</ins><span class="cx"> protected $tag;
</span><span class="cx"> protected $tax;
</span><span class="cx">
</span><span class="lines">@@ -48,6 +49,9 @@
</span><span class="cx"> _make_cat_compat( $this->cat );
</span><span class="cx"> $this->tag = get_term( $this->tag_id, 'post_tag' );
</span><span class="cx">
</span><ins>+ $this->uncat = get_term_by( 'slug', 'uncategorized', 'category' );
+ _make_cat_compat( $this->uncat );
+
</ins><span class="cx"> add_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -106,6 +110,42 @@
</span><span class="cx"> $this->assertEquals( get_queried_object(), $this->cat );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function test_cat_uncat_action_tax() {
+ // category with tax added
+ add_action( 'pre_get_posts', array( $this, '_cat_uncat_action_tax' ), 11 );
+
+ $this->go_to( home_url( "/category/uncategorized/" ) );
+ $this->assertQueryTrue( 'is_category', 'is_archive' );
+ $this->assertNotEmpty( get_query_var( 'cat' ) );
+ $this->assertNotEmpty( get_query_var( 'tax_query' ) );
+ $this->assertNotEmpty( get_query_var( 'taxonomy' ) );
+ $this->assertNotEmpty( get_query_var( 'term_id' ) );
+ $this->assertEquals( get_queried_object(), $this->uncat );
+
+ remove_action( 'pre_get_posts', array( $this, '_cat_uncat_action_tax' ), 11 );
+ }
+
+ function _cat_uncat_action_tax( &$query ) {
+ $this->assertTrue( $query->is_category() );
+ $this->assertTrue( $query->is_archive() );
+ $this->assertNotEmpty( $query->get( 'category_name' ) );
+ $this->assertNotEmpty( $query->get( 'tax_query' ) );
+ $this->assertEquals( $query->get_queried_object(), $this->uncat );
+ }
+
+ /**
+ * @ticket 26728
+ */
+ function test_tax_action_tax() {
+ // tax with tax added
+ $this->go_to( home_url( '/testtax/tax-slug2/' ) );
+ $this->assertQueryTrue( 'is_tax', 'is_archive' );
+ $this->assertNotEmpty( get_query_var( 'tax_query' ) );
+ $this->assertNotEmpty( get_query_var( 'taxonomy' ) );
+ $this->assertNotEmpty( get_query_var( 'term_id' ) );
+ $this->assertEquals( get_queried_object(), get_term( $this->tax_id, 'testtax' ) );
+ }
+
</ins><span class="cx"> function test_tax_query_tag_action_tax() {
</span><span class="cx"> // tax + tag with tax added
</span><span class="cx"> $this->go_to( home_url( "/testtax/tax-slug2/?tag_id=$this->tag_id" ) );
</span></span></pre>
</div>
</div>
</body>
</html>