From 9088df3fee78791a53535dbad599d2554c70e834 Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Wed, 21 Oct 2015 16:54:24 +0000
Subject: [PATCH] Prevent non-public taxonomies from registering  aquery var.

[34247] made the 'public' paramater of `register_taxonomy()` work by blocking
requests for non-public taxonomy archives during `parse_request()`. Blocking
taxonomy archive requests this late means that it's impossible to register an
independent query var that matches the slug of a non-public taxonomy. By
moving the block to `register_taxonomy()` - not allowing these taxonomies to
register their query vars in the first place - we free up the slug for other
use. In addition, we free up a bit of processing (no need to look for the query
var in `parse_request()` and better parallel the way non-public post types
work. See `register_post_type()`.

Non-public taxonomy archives that are requested using `?taxonomy=tax_name` are
still blocked during `parse_request`. It's only custom query vars -
`?tax_name=term` - that are affected by this change.

Props mboynes.
Fixes #21949.
Built from https://develop.svn.wordpress.org/trunk@35333


git-svn-id: http://core.svn.wordpress.org/trunk@35299 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp.php           | 10 ++++------
 wp-includes/taxonomy-functions.php |  2 +-
 wp-includes/version.php            |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 4a3b42c795..0f86251676 100644
--- a/wp-includes/class-wp.php
+++ b/wp-includes/class-wp.php
@@ -311,12 +311,10 @@ class WP {
 		// 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.
+				/*
+				 * Disallow when set to the 'taxonomy' query var.
+				 * Non-public 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'] );
 				}
diff --git a/wp-includes/taxonomy-functions.php b/wp-includes/taxonomy-functions.php
index 6c4a0b5b7e..891951bb9e 100644
--- a/wp-includes/taxonomy-functions.php
+++ b/wp-includes/taxonomy-functions.php
@@ -384,7 +384,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
 		return new WP_Error( 'taxonomy_length_invalid', __( 'Taxonomy names must be between 1 and 32 characters in length.' ) );
 	}
 
-	if ( false !== $args['query_var'] && ! empty( $wp ) ) {
+	if ( false !== $args['query_var'] && false !== $args['public'] && ! empty( $wp ) ) {
 		if ( true === $args['query_var'] )
 			$args['query_var'] = $taxonomy;
 		else
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 88c55b26bd..9f46b8468b 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35332';
+$wp_version = '4.4-alpha-35333';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.