Ticket #34491: 34491.patch

src/wp-includes/class-wp.php

@@ -308 +308 @@
                         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.
+                // 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'] ) {
                                         unset( $this->query_vars['taxonomy'], $this->query_vars['term'] );

src/wp-includes/taxonomy-functions.php

@@ -289 +289 @@
  *                                                taxonomies. See accepted values in get_taxonomy_labels().
  *                                                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. While the default settings
+ *                                                of `$publicly_queryable`, `$show_ui`, and `$show_in_nav_menus`
+ *                                                are inherited from `$public`, each does not rely on this relationship
+ *                                                and controls a very specific intention (default true).
+ *     @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
  *                                                the admin. If not set, the default is inherited from `$public`
@@ -363 +369 @@
                 'labels'                => array(),
                 'description'           => '',
                 'public'                => true,
+                'publicly_queryable'    => null,
                 'hierarchical'          => false,
                 'show_ui'               => null,
                 'show_in_menu'          => null,
@@ -384 +391 @@
                 return new WP_Error( 'taxonomy_length_invalid', __( 'Taxonomy names must be between 1 and 32 characters in length.' ) );
         }
 
-        if ( false !== $args['query_var'] && false !== $args['public'] && ! empty( $wp ) ) {
+        // If not set, default to the setting for public.
+        if ( null === $args['publicly_queryable'] ) {
+                $args['publicly_queryable'] = $args['public'];
+        }
+
+        if ( false !== $args['query_var'] && false !== $args['publicly_queryable'] && ! empty( $wp ) ) {
                 if ( true === $args['query_var'] )
                         $args['query_var'] = $taxonomy;
                 else

tests/phpunit/includes/utils.php

@@ -357 +357 @@
                 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 );
         }
 
@@ -398 +398 @@
  */
 function benchmark_pcre_backtracking( $pattern, $subject, $strategy ) {
         $saved_config = ini_get( 'pcre.backtrack_limit' );
-        
+
         // Attempt to prevent PHP crashes.  Adjust these lower when needed.
         if ( version_compare( phpversion(), '5.4.8', '>' ) ) {
                 $limit = 1000000;
@@ -410 +410 @@
         for( $i = 4; $i <= $limit; $i *= 2 ) {
 
                 ini_set( 'pcre.backtrack_limit', $i );
-                
+
                 switch( $strategy ) {
                 case 'split':
                         preg_split( $pattern, $subject );

tests/phpunit/tests/taxonomy.php

@@ -446 +446 @@
         /**
          * @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 +466 @@
         /**
          * @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 +501 @@
         /**
          * @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(