sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

git-svn-id: https://develop.svn.wordpress.org/trunk@34247 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-09-16 19:04:57 +00:00
parent 1b016b6dc6
commit 302e3d1116
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/wp-includes/class-wp.php
View File

@ -300,6 +300,21 @@ class WP {
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
if ( isset( $this->query_vars['post_type']) ) {
$queryable_post_types = get_post_types( array('publicly_queryable' => true) );

2
src/wp-includes/taxonomy-functions.php
View File

@ -278,7 +278,7 @@ function is_taxonomy_hierarchical($taxonomy) {
* * By default tag labels are used for non-hierarchical types and category labels for hierarchical ones.
* * 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.
* - show_ui - Whether to generate a default UI for managing this taxonomy in the admin.

40
tests/phpunit/tests/taxonomy.php
View File

@ -442,4 +442,44 @@ class Tests_Taxonomy extends WP_UnitTestCase {
$this->assertEqualSets( array( $t1 ), get_ancestors( $t2, 'wptests_conflict' ) );
_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' ) );
}
}