From d851a2cdeddd123f59cbb09a389377213f716f43 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 17 Jul 2016 16:33:30 +0000
Subject: [PATCH] Taxonomy: Correct `WP_Error` usage in
 `WP_Tax_Query::clean_query()` and `WP_Tax_Query::transform_query()`.

Fixes #37389.
Built from https://develop.svn.wordpress.org/trunk@38079


git-svn-id: http://core.svn.wordpress.org/trunk@38020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-tax-query.php | 6 +++---
 wp-includes/version.php            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php
index c77538d00a..9bff196f28 100644
--- a/wp-includes/class-wp-tax-query.php
+++ b/wp-includes/class-wp-tax-query.php
@@ -562,14 +562,14 @@ class WP_Tax_Query {
 	private function clean_query( &$query ) {
 		if ( empty( $query['taxonomy'] ) ) {
 			if ( 'term_taxonomy_id' !== $query['field'] ) {
-				$query = new WP_Error( 'Invalid taxonomy' );
+				$query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 				return;
 			}
 
 			// so long as there are shared terms, include_children requires that a taxonomy is set
 			$query['include_children'] = false;
 		} elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {
-			$query = new WP_Error( 'Invalid taxonomy' );
+			$query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
 			return;
 		}
 
@@ -655,7 +655,7 @@ class WP_Tax_Query {
 		}
 
 		if ( 'AND' == $query['operator'] && count( $terms ) < count( $query['terms'] ) ) {
-			$query = new WP_Error( 'Inexistent terms' );
+			$query = new WP_Error( 'inexistent_terms', __( 'Inexistent terms.' ) );
 			return;
 		}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index f1d921fd40..c1b11de1fe 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta3-38078';
+$wp_version = '4.6-beta3-38079';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.