Changeset 30031

Timestamp:

10/26/2014 10:56:36 PM (10 years ago)

Author:

boonebgorges

Message:

Improve WP_Tax_Query param sanitization for empty strings.

When an empty string is passed as one of the clauses in the $tax_query
parameter, it should be discarded rather than parsed as a first-order clause.

Props tmtrademark.
Fixes #30117.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -833 +833 @@
      */
     protected static function is_first_order_clause( $query ) {
-        return empty( $query ) || array_key_exists( 'terms', $query ) || array_key_exists( 'taxonomy', $query ) || array_key_exists( 'include_children', $query ) || array_key_exists( 'field', $query ) || array_key_exists( 'operator', $query );
+        return is_array( $query ) && ( empty( $query ) || array_key_exists( 'terms', $query ) || array_key_exists( 'taxonomy', $query ) || array_key_exists( 'include_children', $query ) || array_key_exists( 'field', $query ) || array_key_exists( 'operator', $query ) );
     }
 

trunk/tests/phpunit/tests/term/query.php

@@ -84 +84 @@
 
         $this->assertEquals( array( 'foo', ), $tq->queries[0]['terms'] );
+    }
+
+    /**
+     * @ticket 30117
+     */
+    public function test_construct_empty_strings_array_members_should_be_discarded() {
+        $q = new WP_Tax_Query( array(
+            '',
+            array(
+                'taxonomy' => 'post_tag',
+                'terms' => 'foo',
+            ),
+        ) );
+
+        $this->assertSame( 1, count( $q->queries ) );
     }