Ticket #35619: 35619.2.patch

src/wp-includes/query.php

@@ -2857 +2857 @@
                                                 } else {
                                                         $q['term_id'] = $queried_items['terms'][0];
                                                 }
+                                                break; // we got one, break the loop
                                         }
                                 }
                         }

tests/phpunit/tests/query.php

@@ -522 +522 @@
 
                 $this->assertSame( array( $p2 ), $q->posts );
         }
+
+        /**
+         * @ticket 35619
+         */
+        public function test_query_two_custom_taxonomies() {
+                register_taxonomy( 'tax1', 'post' );
+                register_taxonomy( 'tax2', 'post' );
+
+                $term1 = $this->factory->term->create( array( 'taxonomy' => 'tax1', 'name' => 'term1' ) );
+                $term2 = $this->factory->term->create( array( 'taxonomy' => 'tax2', 'name' => 'term2' ) );
+                $post_id = $this->factory->post->create();
+                wp_set_object_terms( $post_id, 'term1', 'tax1' );
+                wp_set_object_terms( $post_id, 'term2', 'tax2' );
+
+                $this->assertTrue( is_object_in_term( $post_id, 'tax1' , $term1 ) );
+                $this->assertTrue( is_object_in_term( $post_id, 'tax2' , $term2 ) );
+
+                $this->go_to( home_url('?tax1=term1&tax2=term2') );
+                $queried_object = get_queried_object();
+
+                $this->assertEquals( get_query_var('taxonomy'), $queried_object->taxonomy );
+                $this->assertEquals( get_query_var('term'), $queried_object->slug );
+        }
 }