Changeset 26946 for branches/3.8/src/wp-includes/query.php

Timestamp:

01/15/2014 07:33:23 AM (11 years ago)

Author:

nacin

Message:

Query: Fix category handling in pre_get_posts when pretty permalinks are in use (category_name query variable).

Merges [26864] [26874] [26875] to the 3.8 branch.

props wonderboymusic, SergeyBiryukov.
fixes #26627.

Location:

branches/3.8

Files:

• . (modified) (1 prop)
• src/wp-includes/query.php (modified) (2 diffs)

branches/3.8/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' );
@@ -3272 +3276 @@
                 $query = reset( $tax_query_in_and );
 
-                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'] );
+                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'] );
+                    }
+                }
             }