Changeset 38585

Timestamp:

09/09/2016 07:36:22 PM (9 years ago)

Author:

boonebgorges

Message:

Query: Avoid PHP notice in get_queried_object() when query contains NOT EXISTS tax query.

Props johnjamesjacoby.
See #37962.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-query.php

@@ -3265 +3265 @@
                     $query = $tax_query_in_and[ $matched_taxonomy ];
 
-                    if ( $query['terms'] ) {
+                    if ( ! empty( $query['terms'] ) ) {
                         if ( 'term_id' == $query['field'] ) {
                             $term = get_term( reset( $query['terms'] ), $matched_taxonomy );

trunk/tests/phpunit/tests/query.php

@@ -119 +119 @@
     }
 
+    /**
+     * @ticket 37962
+     */
+    public function test_get_queried_object_should_return_null_for_not_exists_tax_query() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $q = new WP_Query( array(
+            'tax_query' => array(
+                array(
+                    'taxonomy' => 'wptests_tax',
+                    'operator' => 'NOT EXISTS',
+                ),
+            ),
+        ) );
+
+        $queried_object = $q->get_queried_object();
+        $this->assertNull( $queried_object );
+    }
+
     public function test_orderby_space_separated() {
         global $wpdb;