Changeset 27511

Timestamp:

03/12/2014 04:07:41 AM (12 years ago)

Author:

wonderboymusic

Message:

In WP_Query::get_queried_object(), account for pre_get_posts by checking for tag when tag_id isn't present. Tags still need to be rolled up into tax_query. Add a unit test confirming expected query vars during and after pre_get_posts.

Props mattonomics for a patch.
See #27362.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (1 diff)
• tests/phpunit/tests/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -3664 +3664 @@
                                 }
                         } elseif ( $this->is_tag ) {
-                                $term = get_term( $this->get( 'tag_id' ), 'post_tag' );
+                                if ( $this->get( 'tag_id' ) ) {
+                                        $term = get_term( $this->get( 'tag_id' ), 'post_tag' );
+                                } elseif ( $this->get( 'tag' ) ) {
+                                        $term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' );
+                                }
                         } else {
                                 $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );

trunk/tests/phpunit/tests/query.php

@@ -105 +105 @@
                 $query->set( 'posts_per_rss', 30 );
         }
+
+        /**
+         * @ticket 26627
+         */
+        function test_tag_queried_object() {
+                $slug = 'tag-slug-26627';
+                $this->factory->tag->create( array( 'slug' => $slug ) );
+                $tag = get_term_by( 'slug', $slug, 'post_tag' );
+
+                add_action( 'pre_get_posts', array( $this, '_tag_queried_object' ), 11 );
+
+                $this->go_to( get_term_link( $tag ) );
+
+                $this->assertQueryTrue( 'is_tag', 'is_archive' );
+                $this->assertNotEmpty( get_query_var( 'tag_id' ) );
+                $this->assertNotEmpty( get_query_var( 'tag' ) );
+                $this->assertEmpty( get_query_var( 'tax_query' ) );
+                $this->assertCount( 1, get_query_var( 'tag_slug__in' ) );
+                $this->assertEquals( get_queried_object(), $tag );
+
+                remove_action( 'pre_get_posts', array( $this, '_tag_queried_object' ), 11 );
+        }
+
+        function _tag_queried_object( &$query ) {
+                $tag = get_term_by( 'slug', 'tag-slug-26627', 'post_tag' );
+                $this->assertTrue( $query->is_tag() );
+                $this->assertTrue( $query->is_archive() );
+                $this->assertNotEmpty( $query->get( 'tag' ) );
+                $this->assertCount( 1, $query->get( 'tag_slug__in' ) );
+                $this->assertEquals( $query->get_queried_object(), $tag );
+        }
 }