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

get_term_children() and category query fixes. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-05-29 21:27:49 +00:00
parent 6a314d85d8
commit 3176f1acd2
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wp-includes/query.php
View File

@ -844,36 +844,34 @@ class WP_Query {
$q['cat'] = addslashes_gpc($q['cat']); $q['cat'] = addslashes_gpc($q['cat']);
$join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) "; $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
$cat_array = preg_split('/[,\s]+/', $q['cat']); $cat_array = preg_split('/[,\s]+/', $q['cat']);
$in_cats = $out_cats = $out_posts = ''; $in_cats = $out_cats = array();
$include_cats = $exclude_cats = '';
foreach ( $cat_array as $cat ) { foreach ( $cat_array as $cat ) {
$cat = intval($cat); $cat = intval($cat);
$in = (strpos($cat, '-') !== false) ? false : true; $in = ($cat > 0);
$cat = trim($cat, '-'); $cat = abs($cat);
// TODO make an array, not a string, for out_cats. use get_term_children() if ( $in ) {
if ( $in ) $in_cats[] = $cat;
$in_cats .= "$cat, " . get_category_children($cat, '', ', '); $in_cats = array_merge($in_cats, get_term_children($cat, 'category'));
else } else {
$out_cats .= "$cat, " . get_category_children($cat, '', ', '); $out_cats[] = $cat;
$out_cats = arry_merge($out_cats, get_term_children($cat, 'category'));
}
} }
$in_cats = substr($in_cats, 0, -2); if ( ! empty($in_cats) ) {
$out_cats = substr($out_cats, 0, -2); $include_cats = "'" . implode("', '", $in_cats) . "'";
if ( strlen($in_cats) > 0 ) $include_cats = " AND $wpdb->term_taxonomy.term_id IN ($include_cats) ";
$in_cats = " AND $wpdb->term_taxonomy.term_id IN ({$q['cat']}) "; }
if ( strlen($out_cats) > 0 ) {
// TODO use get_objects_in_term if ( !empty($out_cats) ) {
$ids = get_objects_in_terms($out_cats, 'category'); $ids = get_objects_in_terms($out_cats, 'category');
if ( is_array($ids) && count($ids > 0) ) { if ( is_array($ids) && count($ids > 0) ) {
foreach ( $ids as $id ) $out_posts = "'" . implode("', '", $ids) . "'";
$out_posts .= "$id, "; $exclude_cats = " AND $wpdb->posts.ID NOT IN ($out_posts)";
$out_posts = substr($out_posts, 0, -2);
} }
if ( strlen($out_posts) > 0 )
$out_cats = " AND $wpdb->posts.ID NOT IN ($out_posts)";
else
$out_cats = '';
} }
$whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' "; $whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
$whichcat .= $in_cats . $out_cats; $whichcat .= $include_cats . $exclude_cats;
$groupby = "{$wpdb->posts}.ID"; $groupby = "{$wpdb->posts}.ID";
} }

16
wp-includes/taxonomy.php
View File

@ -656,6 +656,22 @@ function get_term_by($field, $value, $taxonomy, $output = OBJECT) {
} }
} }
function get_term_children( $term, $taxonomy ) {
$terms = _get_term_hierarchy($taxonomy);
if ( ! isset($terms[$term]) )
return array();
$children = $terms[$term];
foreach ( $terms[$term] as $child ) {
if ( isset($terms[$child]) )
$children = array_merge($children, get_term_children($child, $taxonomy));
}
return $children;
}
function clean_term_cache($ids, $taxonomy) { function clean_term_cache($ids, $taxonomy) {
if ( !is_array($ids) ) if ( !is_array($ids) )
$ids = array($ids); $ids = array($ids);