Ticket #21949: 21949.3.diff

src/wp-includes/class-wp.php

@@ -303 +303 @@
                 // Don't allow non-public taxonomies to be queried from the front-end.
                 if ( ! is_admin() ) {
                         foreach ( get_taxonomies( array( 'public' => false ), 'objects' ) as $taxonomy => $t ) {
-                                // Check first for taxonomy-specific query_var.
-                                if ( $t->query_var && isset( $this->query_vars[ $t->query_var ] ) ) {
-                                        unset( $this->query_vars[ $t->query_var ] );
-                                }
-
-                                // Next, check the 'taxonomy' query_var.
+                                /*
+                                 * Disallow when set to the 'taxonomy' query var.
+                                 * Non-public taxonomies cannot register custom query vars. See register_taxonomy().
+                                 */
                                 if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
                                         unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
                                 }

tests/phpunit/includes/utils.php

@@ -357 +357 @@
                 unset( $GLOBALS[$v] );
 
         foreach ( get_taxonomies( array() , 'objects' ) as $t ) {
-                if ( ! empty( $t->query_var ) )
+                if ( $t->public && ! empty( $t->query_var ) )
                         $GLOBALS['wp']->add_query_var( $t->query_var );
         }
 

tests/phpunit/tests/taxonomy.php

@@ -466 +466 @@
         /**
          * @ticket 21949
          */
+        public function test_it_should_be_possible_to_register_a_query_var_that_matches_the_name_of_a_nonpublic_taxonomy() {
+                global $wp;
+
+                register_taxonomy( 'wptests_tax', 'post', array(
+                        'public' => false,
+                ) );
+                $t = $this->factory->term->create_and_get( array(
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $p = $this->factory->post->create();
+                wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
+
+                add_filter( 'do_parse_request', array( $this, 'register_query_var' ) );
+                $this->go_to( '/?wptests_tax=foo' );
+                remove_filter( 'do_parse_request', array( $this, 'register_query_var' ) );
+
+                // Not a taxonomy...
+                $this->assertFalse( is_tax( 'wptests_tax' ) );
+
+                // ...but query var works.
+                $this->assertSame( 'foo', $wp->query_vars['wptests_tax'] );
+        }
+
+        public static function register_query_var( $r ) {
+                global $wp;
+
+                $wp->add_query_var( 'wptests_tax' );
+
+                return $r;
+        }
+
+        /**
+         * @ticket 21949
+         */
         public function test_nonpublic_taxonomy_should_not_be_queryable_using_taxonomy_and_term_vars() {
                 register_taxonomy( 'wptests_tax', 'post', array(
                         'public' => false,