Ticket #35089: 35089.diff

src/wp-includes/taxonomy.php

@@ -390 +390 @@
                 else
                         $args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
                 $wp->add_query_var( $args['query_var'] );
+        } else {
+                // Force query_var to false for non-public taxonomies.
+                $args['query_var'] = false;
         }
 
         if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {

tests/phpunit/tests/taxonomy.php

@@ -517 +517 @@
 
                 $this->assertFalse( is_tax( 'wptests_tax' ) );
         }
+
+        /**
+         * @ticket 35089
+         */
+        public function test_query_var_should_be_forced_to_false_for_non_public_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post', array(
+                        'public' => false,
+                        'query_var' => true,
+                ) );
+
+                $tax = get_taxonomy( 'wptests_tax' );
+                $this->assertFalse( $tax->query_var );
+        }
 }