From a587ebc946e6bfeaafe960d7db2fa6300d372a21 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Mon, 3 Nov 2014 03:45:22 +0000
Subject: [PATCH] In `WP_Tax_Query`, declare `$primary_table` and
 `$primary_id_column` as properties.

See #30224.

Built from https://develop.svn.wordpress.org/trunk@30184


git-svn-id: http://core.svn.wordpress.org/trunk@30184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/taxonomy.php | 18 ++++++++++++++++++
 wp-includes/version.php  |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 44307fae60..b1da6f109f 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -681,6 +681,24 @@ class WP_Tax_Query {
 	 */
 	public $queried_terms = array();
 
+	/**
+	 * Database table that where the metadata's objects are stored (eg $wpdb->users).
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 * @var string
+	 */
+	public $primary_table;
+
+	/**
+	 * Column in primary_table that represents the ID of the object.
+	 *
+	 * @since 4.1.0
+	 * @access public
+	 * @var string
+	 */
+	public $primary_id_column;
+
 	/**
 	 * Constructor.
 	 *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3c4026ead5..e7bbc38540 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30183';
+$wp_version = '4.1-alpha-30184';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.