sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use get_term_children() and get_term_field(). see #4189

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@5660 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2007-06-06 16:13:12 +00:00
parent 4feb85438d
commit e1ef29586c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/category-template.php
View File

@ -172,8 +172,8 @@ function category_description($category = 0) {
global $cat; global $cat;
if ( !$category ) if ( !$category )
$category = $cat; $category = $cat;
$category = & get_category($category);
return apply_filters('category_description', $category->description, $category->term_id); return get_term_field('description', $category, 'category');
} }
function wp_dropdown_categories($args = '') { function wp_dropdown_categories($args = '') {

10
wp-includes/query.php
View File

@ -915,15 +915,13 @@ class WP_Query {
$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) ";
$whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' "; $whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
$whichcat .= "AND $wpdb->term_taxonomy.term_id IN ({$q['cat']}, "; $in_cats = array($q['cat']);
$whichcat .= get_category_children($q['cat'], '', ', '); $in_cats = array_merge($in_cats, get_term_children($q['cat'], 'category'));
$whichcat = substr($whichcat, 0, -2); $in_cats = "'" . implode("', '", $in_cats) . "'";
$whichcat .= ")"; $whichcat .= "AND $wpdb->term_taxonomy.term_id IN ($in_cats)";
$groupby = "{$wpdb->posts}.ID"; $groupby = "{$wpdb->posts}.ID";
} }
// Author/user stuff // Author/user stuff
if ( empty($q['author']) || ($q['author'] == '0') ) { if ( empty($q['author']) || ($q['author'] == '0') ) {