vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set tax query defaults earlier, for notice prevention and convenience. See #15752

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@16843 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
scribu
2010-12-09 17:05:40 +00:00
parent df562b62f4
commit a5cb537970
2 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/query.php
View File

@@ -1491,7 +1491,6 @@ class WP_Query {
'taxonomy' => $q['taxonomy'],
'terms' => array( $q['term'] ),
'field' => 'slug',
'operator' => 'IN',
);
}
@@ -1500,7 +1499,6 @@ class WP_Query {
$tax_query_defaults = array(
'taxonomy' => $taxonomy,
'field' => 'slug',
'operator' => 'IN'
);
if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
@@ -1550,7 +1548,6 @@ class WP_Query {
$tax_query[] = array(
'taxonomy' => 'category',
'terms' => $q['category__in'],
'operator' => 'IN',
'field' => 'term_id'
);
}
@@ -1561,7 +1558,6 @@ class WP_Query {
'taxonomy' => 'category',
'terms' => $q['category__not_in'],
'operator' => 'NOT IN',
'field' => 'term_id'
);
}
@@ -1570,8 +1566,6 @@ class WP_Query {
$tax_query[] = array(
'taxonomy' => 'post_tag',
'terms' => $qv['tag_id'],
'operator' => 'IN',
'field' => 'term_id'
);
}
@@ -1579,8 +1573,6 @@ class WP_Query {
$tax_query[] = array(
'taxonomy' => 'post_tag',
'terms' => $q['tag__in'],
'operator' => 'IN',
'field' => 'term_id'
);
}
@@ -1589,11 +1581,15 @@ class WP_Query {
'taxonomy' => 'post_tag',
'terms' => $q['tag__not_in'],
'operator' => 'NOT IN',
'field' => 'term_id'
);
}
_set_tax_query_defaults( $tax_query );
foreach ( $tax_query as $query ) {
if ( ! is_array( $query ) )
continue;
if ( 'IN' == $query['operator'] ) {
switch ( $query['taxonomy'] ) {
case 'category':
@@ -1945,7 +1941,8 @@ class WP_Query {
// Taxonomies
if ( !$this->is_singular ) {
$this->tax_query = $this->parse_tax_query( $q );
if ( !empty( $this->tax_query ) ) {
if ( ! empty( $this->tax_query ) ) {
$clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
$join .= $clauses['join'];