WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New taxonomy intersection queries from xknown. fixes #5137 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-10-04 18:10:03 +00:00
parent 3211ab1d54
commit fe60a3ab06
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wp-includes/query.php
View File

@ -948,15 +948,6 @@ class WP_Query {
} }
} }
if ( !empty($q['category__and']) ) {
$count = 0;
foreach ( $q['category__and'] as $category_and ) {
$join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) ";
$whichcat .= " AND tt$count.term_id = '$category_and' ";
$count++;
}
}
// Category stuff for nice URLs // Category stuff for nice URLs
if ( '' != $q['category_name'] ) { if ( '' != $q['category_name'] ) {
$reqcat = get_category_by_path($q['category_name']); $reqcat = get_category_by_path($q['category_name']);
@ -1051,28 +1042,32 @@ class WP_Query {
} }
} }
if ( !empty($q['tag__and']) ) { // Tag and slug intersections.
$count = 0; $intersections = array('category__and' => 'category', 'tag__and' => 'post_tag', 'tag_slug__and' => 'post_tag');
foreach ( $q['tag__and'] as $tag_and ) { foreach ($intersections as $item => $taxonomy) {
$join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) "; if ( empty($q[$item]) ) continue;
$whichcat .= " AND tt$count.term_id = '$tag_and' ";
$count++; if ( $item != 'category__and' ) {
} $reqtag = is_term( $q[$item][0], 'post_tag' );
$reqtag = is_term( $q['tag__and'][0], 'post_tag' );
if ( !empty($reqtag) ) if ( !empty($reqtag) )
$q['tag_id'] = $reqtag['term_id']; $q['tag_id'] = $reqtag['term_id'];
} }
if ( !empty($q['tag_slug__and']) ) { $taxonomy_field = $item == 'tag_slug__and' ? 'slug' : 'term_id';
$count = 0;
foreach ( $q['tag_slug__and'] as $tag_and ) { $q[$item] = array_unique($q[$item]);
$join .= " LEFT JOIN $wpdb->term_relationships AS tr$count ON ($wpdb->posts.ID = tr$count.object_id) LEFT JOIN $wpdb->term_taxonomy AS tt$count ON (tr$count.term_taxonomy_id = tt$count.term_taxonomy_id) LEFT JOIN $wpdb->terms AS term$count ON (tt$count.term_id = term$count.term_id) "; $tsql = "SELECT p.ID FROM $wpdb->posts p LEFT JOIN $wpdb->term_relationships tr ON (p.ID = tr.object_id) LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) LEFT JOIN $wpdb->terms t ON (tt.term_id = t.term_id)";
$whichcat .= " AND term$count.slug = '$tag_and' "; $tsql .= "WHERE tt.taxonomy = '$taxonomy' AND t.$taxonomy_field IN ('" . implode("', '", $q[$item]) . "')";
$count++; $tsql .= "GROUP BY p.ID HAVING count(p.ID) = " . count($q[$item]);
$post_ids = $wpdb->get_col($tsql);
if ( count($post_ids) )
$whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
else {
$whichcat = " AND 0 = 1";
break;
} }
$reqtag = is_term( $q['tag_slug__and'][0], 'post_tag' );
if ( !empty($reqtag) )
$q['tag_id'] = $reqtag['term_id'];
} }
// Author/user stuff // Author/user stuff