Changeset 26864 for trunk/src/wp-includes/query.php

Timestamp:

12/22/2013 06:30:09 PM (11 years ago)

Author:

wonderboymusic

Message:

Fix a regression for get_queried_object() by checking for category_name when cat isn't set - mainly is_category() being true for Uncategorized or when queried object is accessed in pre_get_posts. Also check for $query['terms'] when trying to assign a term as the queried object when is_tax() is true. Adds a unit test. See [26007] for how I originally broke this while fixing a bigger issue.

Props Chouby, jeremyfelt.
Fixes #26634, #26627.

File:

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

trunk/src/wp-includes/query.php

@@ -3265 +3265 @@
         if ( $this->is_category || $this->is_tag || $this->is_tax ) {
             if ( $this->is_category ) {
-                $term = get_term( $this->get( 'cat' ), 'category' );
+                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' );
+                }
             } elseif ( $this->is_tag ) {
                 $term = get_term( $this->get( 'tag_id' ), 'post_tag' );
-            } else {
+            } elseif ( $query['terms'] ) {
                 $tax_query_in_and = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'NOT IN' ), 'NOT' );
                 $query = reset( $tax_query_in_and );