golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

query by parent, not child_of, in get_nested_categories(). see #4189 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-06-01 02:24:07 +00:00
parent fb6ce027e1
commit 9e8bfa7f7b
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/template.php
View File

@ -100,7 +100,7 @@ function get_nested_categories( $default = 0, $parent = 0 ) {
}
}
$cats = get_categories("child_of=$parent&hide_empty=0&fields=ids");
$cats = get_categories("parent=$parent&hide_empty=0&fields=ids");
$result = array ();
if ( is_array( $cats ) ) {

15
wp-includes/taxonomy.php
View File

@ -480,13 +480,12 @@ function &get_terms($taxonomies, $args = '') {
'hierarchical' => true, 'child_of' => 0, 'get' => '');
$args = wp_parse_args( $args, $defaults );
$args['number'] = (int) $args['number'];
if ( ! $single_taxonomy ) {
$args['child_of'] = 0;
$args['hierarchical'] = false;
} else if ( !is_taxonomy_hierarchical($taxonomies[0]) ) {
if ( !$single_taxonomy || !is_taxonomy_hierarchical($taxonomies[0]) ||
'' != $args['parent'] ) {
$args['child_of'] = 0;
$args['hierarchical'] = false;
}
if ( 'all' == $args['get'] ) {
$args['child_of'] = 0;
$args['hide_empty'] = 0;
@ -500,6 +499,12 @@ function &get_terms($taxonomies, $args = '') {
return array();
}
if ( $parent ) {
$hierarchy = _get_term_hierarchy($taxonomies[0]);
if ( !isset($hierarchy[$parent]) )
return array();
}
$key = md5( serialize( $args ) . serialize( $taxonomies ) );
if ( $cache = wp_cache_get( 'get_terms', 'terms' ) ) {
if ( isset( $cache[ $key ] ) )
@ -555,7 +560,7 @@ function &get_terms($taxonomies, $args = '') {
$where = " AND t.slug = '$slug'";
}
if ( !empty($parent) ) {
if ( '' != $parent ) {
$parent = (int) $parent;
$where = " AND tt.parent = '$parent'";
}