Changeset 36109 for branches/4.4

Timestamp:

12/27/2015 04:42:35 PM (9 years ago)

Author:

boonebgorges

Message:

Force non-public taxonomies to have a query_var of false.

[35333] implemented public=false for taxonomies. The implementation prevented
non-public taxonomies from having their archives accessed via query_var during
a normal request. But it didn't prevent non-public taxonomies from registering
their query vars in the $wp_taxonomies global. The latter implementation
details causes problems specifically when a taxonomy is registered with
query_var=true; for public taxonomies, register_taxonomy() translates this
into a query_var equivalent to the taxonomy name, but in the case of non-public
taxonomies, the query_var was set to the boolean itself. The boolean then
causes problems when using non-strict comparison to filter taxonomy objects by
query_var, as when using get_taxonomies().

This changeset addresses the issue by forcing the query_var property of
non-public taxonomies to false.

Merges [36108] to the 4.4 branch.

Fixes #35089.

Location:

branches/4.4

Files:

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

branches/4.4/src/wp-includes/taxonomy.php

@@ -391 +391 @@
             $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;
     }
 

branches/4.4/tests/phpunit/tests/taxonomy.php

@@ -518 +518 @@
         $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 );
+    }
 }