Changeset 5622

Timestamp:

06/01/2007 02:24:07 AM (19 years ago)

Author:

ryan

Message:

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

Location:

trunk

Files:

• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (3 diffs)

trunk/wp-admin/includes/template.php

@@ -101 +101 @@
         }
 
-        $cats = get_categories("child_of=$parent&hide_empty=0&fields=ids");
+        $cats = get_categories("parent=$parent&hide_empty=0&fields=ids");
 
         $result = array ();

trunk/wp-includes/taxonomy.php

@@ -481 +481 @@
         $args = wp_parse_args( $args, $defaults );
         $args['number'] = (int) $args['number'];
-        if ( ! $single_taxonomy ) {
+        if ( !$single_taxonomy || !is_taxonomy_hierarchical($taxonomies[0]) ||
+                '' != $args['parent'] ) {
                 $args['child_of'] = 0;
                 $args['hierarchical'] = false;
-        } else if ( !is_taxonomy_hierarchical($taxonomies[0]) ) {
-                $args['child_of'] = 0;
-                $args['hierarchical'] = false;
-        }
+        }
+
         if ( 'all' == $args['get'] ) {
                 $args['child_of'] = 0;
@@ -498 +497 @@
                 $hierarchy = _get_term_hierarchy($taxonomies[0]);
                 if ( !isset($hierarchy[$child_of]) )
+                        return array();
+        }
+
+        if ( $parent ) {
+                $hierarchy = _get_term_hierarchy($taxonomies[0]);
+                if ( !isset($hierarchy[$parent]) )
                         return array();
         }
@@ -556 +561 @@
         }
 
-        if ( !empty($parent) ) {
+        if ( '' != $parent ) {
                 $parent = (int) $parent;
                 $where = " AND tt.parent = '$parent'";