Changeset 5612

Timestamp:

05/31/2007 03:44:18 AM (16 years ago)

Author:

ryan

Message:

If a term has no children, return an empty array for child_of queries. see #4189

Location:

trunk

Files:

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

trunk/wp-admin/includes/template.php

@@ -86 +86 @@
 
 function get_nested_categories( $default = 0, $parent = 0 ) {
-    global $post_ID, $mode, $wpdb;
-
-    if ( $post_ID ) {
-        $checked_categories = wp_get_post_categories($post_ID);
-
-        if ( count( $checked_categories ) == 0 ) {
-            // No selected categories, strange
+    global $post_ID, $mode, $wpdb, $checked_categories;
+
+    if ( empty($checked_categories) ) {
+        if ( $post_ID ) {
+            $checked_categories = wp_get_post_categories($post_ID);
+
+            if ( count( $checked_categories ) == 0 ) {
+                // No selected categories, strange
             $checked_categories[] = $default;
-        }
-    } else {
-        $checked_categories[] = $default;
+            }
+        } else {
+            $checked_categories[] = $default;
+        }
     }
 
     $cats = get_categories("child_of=$parent&hide_empty=0&fields=ids");
+
     $result = array ();
-
     if ( is_array( $cats ) ) {
         foreach ( $cats as $cat) {
-            // TODO fix hierarchy
-            //$result[$cat]['children'] = get_nested_categories( $default, $cat);
+            $result[$cat]['children'] = get_nested_categories( $default, $cat);
             $result[$cat]['cat_ID'] = $cat;
             $result[$cat]['checked'] = in_array( $cat, $checked_categories );

trunk/wp-includes/taxonomy.php

@@ -408 +408 @@
 function get_object_terms($object_ids, $taxonomies, $args = array()) {
     global $wpdb;
-    
+    error_log("Objects: " . var_export($object_ids, true), 0);
     if ( !is_array($taxonomies) )
         $taxonomies = array($taxonomies);
@@ -483 +483 @@
     extract($args);
 
+    if ( $child_of ) {
+        $hierarchy = _get_term_hierarchy($taxonomies[0]);
+        if ( !isset($hierarchy[$child_of]) )
+            return array();
+    }
+
     $key = md5( serialize( $args ) . serialize( $taxonomies ) );
     if ( $cache = wp_cache_get( 'get_terms', 'terms' ) ) {