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.

git-svn-id: https://develop.svn.wordpress.org/trunk@36525 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges
2016-02-13 03:50:37 +00:00
parent d03ae82c32
commit 7f87a14808
4 changed files with 91 additions and 13 deletions

View File

@@ -362,7 +362,7 @@ function _cleanup_query_vars() {
unset( $GLOBALS[$v] );
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 );
}

View File

@@ -446,9 +446,9 @@ class Tests_Taxonomy extends WP_UnitTestCase {
/**
* @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,
) );
$t = self::factory()->term->create_and_get( array(
@@ -466,11 +466,11 @@ class Tests_Taxonomy extends WP_UnitTestCase {
/**
* @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(
'taxonomy' => 'wptests_tax',
@@ -501,9 +501,9 @@ class Tests_Taxonomy extends WP_UnitTestCase {
/**
* @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(
'public' => false,
'publicly_queryable' => false,
) );
$t = self::factory()->term->create_and_get( array(
@@ -518,6 +518,73 @@ class Tests_Taxonomy extends WP_UnitTestCase {
$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',
) );
$p = self::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 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' ) );
}
/**
* @ticket 35089
*/