Changeset 36525

Timestamp:

02/13/2016 03:50:37 AM (9 years ago)

Author:

boonebgorges

Message:

Introduce publicly_queryable taxonomy argument.

Taxonomies registered as publicly_queryable can be queried as taxonomy
archives.

If not provided explicitly, the value of publicly_queryable is inherited
from public.

Props Chouby.
Fixes #34491.

Location:

trunk

Files:

• src/wp-includes/class-wp.php (modified) (1 diff)
• src/wp-includes/taxonomy.php (modified) (3 diffs)
• tests/phpunit/includes/utils.php (modified) (1 diff)
• tests/phpunit/tests/taxonomy.php (modified) (4 diffs)

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

@@ -332 +332 @@
                 $this->query_vars[$t->query_var] = str_replace( ' ', '+', $this->query_vars[$t->query_var] );
 
-        // Don't allow non-public taxonomies to be queried from the front-end.
+        // Don't allow non-publicly queryable taxonomies to be queried from the front-end.
         if ( ! is_admin() ) {
-            foreach ( get_taxonomies( array( 'public' => false ), 'objects' ) as $taxonomy => $t ) {
+            foreach ( get_taxonomies( array( 'publicly_queryable' => false ), 'objects' ) as $taxonomy => $t ) {
                 /*
                  * Disallow when set to the 'taxonomy' query var.
-                 * Non-public taxonomies cannot register custom query vars. See register_taxonomy().
+                 * Non-publicly queryable taxonomies cannot register custom query vars. See register_taxonomy().
                  */
                 if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {

trunk/src/wp-includes/taxonomy.php

@@ -289 +289 @@
  *                                                Default empty array.
  *     @type string        $description           A short descriptive summary of what the taxonomy is for. Default empty.
- *     @type bool          $public                Whether the taxonomy is publicly queryable. Default true.
+ *     @type bool          $public                Whether a taxonomy is intended for use publicly either via
+ *                                                the admin interface or by front-end users. The default settings
+ *                                                of `$publicly_queryable`, `$show_ui`, and `$show_in_nav_menus`
+ *                                                are inherited from `$public`.
+ *     @type bool          $publicly_queryable    Whether the taxonomy is publicly queryable.
+ *                                                If not set, the default is inherited from `$public`
  *     @type bool          $hierarchical          Whether the taxonomy is hierarchical. Default false.
  *     @type bool          $show_ui               Whether to generate and allow a UI for managing terms in this taxonomy in
@@ -363 +368 @@
         'description'           => '',
         'public'                => true,
+        'publicly_queryable'    => null,
         'hierarchical'          => false,
         'show_ui'               => null,
@@ -384 +390 @@
     }
 
-    // Non-public taxonomies should not register query vars, except in the admin.
-    if ( false !== $args['query_var'] && ( is_admin() || false !== $args['public'] ) && ! empty( $wp ) ) {
+    // If not set, default to the setting for public.
+    if ( null === $args['publicly_queryable'] ) {
+        $args['publicly_queryable'] = $args['public'];
+    }
+
+    // Non-publicly queryable taxonomies should not register query vars, except in the admin.
+    if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) {
         if ( true === $args['query_var'] )
             $args['query_var'] = $taxonomy;

trunk/tests/phpunit/includes/utils.php

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

trunk/tests/phpunit/tests/taxonomy.php

@@ -447 +447 @@
      * @ticket 21949
      */
-    public function test_nonpublic_taxonomy_should_not_be_queryable_using_taxname_query_var() {
+    public function test_nonpublicly_queryable_taxonomy_should_not_be_queryable_using_taxname_query_var() {
         register_taxonomy( 'wptests_tax', 'post', array(
-            'public' => false,
+            'publicly_queryable' => false,
         ) );
 
@@ -467 +467 @@
      * @ticket 21949
      */
-    public function test_it_should_be_possible_to_register_a_query_var_that_matches_the_name_of_a_nonpublic_taxonomy() {
+    public function test_it_should_be_possible_to_register_a_query_var_that_matches_the_name_of_a_nonpublicly_queryable_taxonomy() {
         global $wp;
 
         register_taxonomy( 'wptests_tax', 'post', array(
-            'public' => false,
+            'publicly_queryable' => false,
         ) );
         $t = $this->factory->term->create_and_get( array(
@@ -502 +502 @@
      * @ticket 21949
      */
-    public function test_nonpublic_taxonomy_should_not_be_queryable_using_taxonomy_and_term_vars() {
+    public function test_nonpublicly_queryable_taxonomy_should_not_be_queryable_using_taxonomy_and_term_vars() {
+        register_taxonomy( 'wptests_tax', 'post', array(
+            'publicly_queryable' => false,
+        ) );
+
+        $t = self::factory()->term->create_and_get( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $p = self::factory()->post->create();
+        wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
+
+        $this->go_to( '/?taxonomy=wptests_tax&term=' . $t->slug );
+
+        $this->assertFalse( is_tax( 'wptests_tax' ) );
+    }
+
+    /**
+     * @ticket 34491
+     */
+    public function test_public_taxonomy_should_be_publicly_queryable() {
+        register_taxonomy( 'wptests_tax', 'post', array(
+            'public' => true,
+        ) );
+
+        $this->assertContains( 'wptests_tax', get_taxonomies( array( 'publicly_queryable' => true ) ) );
+
+        $t = self::factory()->term->create_and_get( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $p = self::factory()->post->create();
+        wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
+
+        $this->go_to( '/?wptests_tax=' . $t->slug );
+
+        $this->assertTrue( is_tax( 'wptests_tax' ) );
+    }
+
+    /**
+     * @ticket 34491
+     */
+    public function test_private_taxonomy_should_not_be_publicly_queryable() {
         register_taxonomy( 'wptests_tax', 'post', array(
             'public' => false,
         ) );
 
+        $this->assertContains( 'wptests_tax', get_taxonomies( array( 'publicly_queryable' => false ) ) );
+
         $t = self::factory()->term->create_and_get( array(
             'taxonomy' => 'wptests_tax',
@@ -514 +558 @@
         wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
 
-        $this->go_to( '/?taxonomy=wptests_tax&term=' . $t->slug );
+        $this->go_to( '/?wptests_tax=' . $t->slug );
 
         $this->assertFalse( is_tax( 'wptests_tax' ) );
+    }
+
+    /**
+     * @ticket 34491
+     */
+    public function test_private_taxonomy_should_be_overridden_by_publicly_queryable() {
+        register_taxonomy( 'wptests_tax', 'post', array(
+            'public' => false,
+            'publicly_queryable' => true,
+        ) );
+
+        $this->assertContains( 'wptests_tax', get_taxonomies( array( 'publicly_queryable' => true ) ) );
+
+        $t = self::factory()->term->create_and_get( array(
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $p = self::factory()->post->create();
+        wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
+
+        $this->go_to( '/?wptests_tax=' . $t->slug );
+
+        $this->assertTrue( is_tax( 'wptests_tax' ) );
     }