Changeset 15654

Timestamp:

09/24/2010 02:08:07 PM (14 years ago)

Author:

scribu

Message:

get_objects_in_term(): include term children when querying by slug. See #12891

File:

• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-includes/taxonomy.php

@@ -472 +472 @@
         $operator = 'IN';
 
+    if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
+        $children = array();
+        foreach ( $terms as $term ) {
+            if ( 'term_id' != $field ) {
+                if ( $term = get_term_by( $field, $term, $taxonomy ) )
+                    $term = $term->term_id;
+                else
+                    continue;                   
+            }
+            $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
+            $children[] = $term;
+        }
+        $terms = $children;
+        $field = 'term_id';
+    }
+
     $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
 
@@ -477 +493 @@
         case 'term_id':
             $terms = array_map( 'intval', $terms );
-
-            if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
-                $children = $terms;
-                foreach ( $terms as $term )
-                    $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
-                $terms = $children;
-            }
 
             $terms = implode( ',', $terms );