Changeset 25238

Timestamp:

09/04/2013 06:16:31 PM (11 years ago)

Author:

wonderboymusic

Message:

Convert category__and to category__in (less expensive) and unset it when only one category is passed. Adds unit tests.

Fixes #24245.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (3 diffs)
• tests/phpunit/tests/term/query.php (added)

trunk/src/wp-includes/query.php

@@ -1763 +1763 @@
         }
 
-        if ( !empty($q['category__in']) ) {
-            $q['category__in'] = array_map('absint', array_unique( (array) $q['category__in'] ) );
+        if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
+            $q['category__and'] = (array) $q['category__and'];
+            if ( ! isset( $q['category__in'] ) )
+                $q['category__in'] = array();
+            $q['category__in'][] = absint( reset( $q['category__and'] ) );
+            unset( $q['category__and'] );
+        }
+            
+        if ( ! empty( $q['category__in'] ) ) {
+            $q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );         
             $tax_query[] = array(
                 'taxonomy' => 'category',
@@ -1773 +1781 @@
         }
 
-        if ( !empty($q['category__not_in']) ) {
-            $q['category__not_in'] = array_map('absint', array_unique( (array) $q['category__not_in'] ) );
+        if ( ! empty($q['category__not_in']) ) {
+            $q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
             $tax_query[] = array(
                 'taxonomy' => 'category',
@@ -1783 +1791 @@
         }
 
-        if ( !empty($q['category__and']) ) {
-            $q['category__and'] = array_map('absint', array_unique( (array) $q['category__and'] ) );
+        if ( ! empty($q['category__and']) ) {
+            $q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
             $tax_query[] = array(
                 'taxonomy' => 'category',