From d4ded42a1b9a09bf0266b36beb1aa92b9da596fe Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 24 Sep 2010 14:08:07 +0000
Subject: [PATCH] get_objects_in_term(): include term children when querying by
 slug. See #12891

git-svn-id: http://svn.automattic.com/wordpress/trunk@15654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/taxonomy.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 73dc7554c4..25d789405f 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -471,19 +471,28 @@ function get_objects_in_term( $terms, $taxonomies, $args = array() ) {
 	if ( !in_array( $operator, array( 'IN', 'NOT IN' ) ) )
 		$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 ) . "'";
 
 	switch ( $field ) {
 		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 );
 			$sql = "
 				SELECT object_id