Changeset 34247

Timestamp:

09/16/2015 07:04:57 PM (11 years ago)

Author:

boonebgorges

Message:

Allow taxonomies to be non-public.

[13216] introduced the 'public' argument for register_taxonomy(). This param
was used to set defaults for 'show_ui' and a number of other params, but it
never did anything itself.

With this changeset, taxonomies registered with public=false will no longer
be queryable on the front end, ie via taxonomy archive queries.

Props wpsmith, ocean90, nacin, ericlewis, boonebgorges.
Fixes #21949.

Location:

trunk

Files:

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

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

@@ -300 +300 @@
                         if ( $t->query_var && isset( $this->query_vars[$t->query_var] ) )
                                 $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.
+                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.
+                                if ( isset( $this->query_vars['taxonomy'] ) && $taxonomy === $this->query_vars['taxonomy'] ) {
+                                        unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );
+                                }
+                        }
+                }
 
                 // Limit publicly queried post_types to those that are publicly_queryable

trunk/src/wp-includes/taxonomy-functions.php

@@ -279 +279 @@
  *     * You can see accepted values in {@link get_taxonomy_labels()}.
  * - description - A short descriptive summary of what the taxonomy is for. Defaults to blank.
- * - public - If the taxonomy should be publicly queryable; //@TODO not implemented.
+ * - public - If the taxonomy should be publicly queryable.
  *     * Defaults to true.
  * - hierarchical - Whether the taxonomy is hierarchical (e.g. category). Defaults to false.

trunk/tests/phpunit/tests/taxonomy.php

@@ -443 +443 @@
                 _unregister_post_type( 'wptests_pt' );
         }
+
+        /**
+         * @ticket 21949
+         */
+        public function test_nonpublic_taxonomy_should_not_be_queryable_using_taxname_query_var() {
+                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' );
+
+                $this->go_to( '/?wptests_tax=' . $t->slug );
+
+                $this->assertFalse( is_tax( 'wptests_tax' ) );
+        }
+
+        /**
+         * @ticket 21949
+         */
+        public function test_nonpublic_taxonomy_should_not_be_queryable_using_taxonomy_and_term_vars() {
+                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' );
+
+                $this->go_to( '/?taxonomy=wptests_tax&term=' . $t->slug );
+
+                $this->assertFalse( is_tax( 'wptests_tax' ) );
+        }
 }