Changeset 15734
- Timestamp:
- 10/06/2010 12:06:23 PM (15 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/classes.php
r15731 r15734 697 697 if ( !isset( $query['include_children'] ) ) 698 698 $query['include_children'] = true; 699 699 700 $query['do_query'] = false; 700 $sql[] = get_objects_in_term( $query['terms'], $query['taxonomy'], $query ); 701 702 $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query ); 703 704 if ( empty( $sql_single ) ) 705 return ' AND 0 = 1'; 706 707 $sql[] = $sql_single; 701 708 } 702 709 -
trunk/wp-includes/taxonomy.php
r15732 r15734 467 467 } 468 468 469 $terms = array_unique( (array) $terms );470 if ( empty($terms) )471 continue;472 473 469 if ( !in_array( $field, array( 'term_id', 'slug', 'name' ) ) ) 474 470 $field = 'term_id'; … … 476 472 if ( !in_array( $operator, array( 'IN', 'NOT IN' ) ) ) 477 473 $operator = 'IN'; 474 475 $terms = array_unique( (array) $terms ); 478 476 479 477 if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) { … … 493 491 } 494 492 493 if ( empty( $terms ) ) 494 return $do_query ? array() : ''; 495 495 496 $taxonomies = "'" . implode( "', '", $taxonomies ) . "'"; 496 497 … … 528 529 } 529 530 530 if ( !$do_query ) 531 return $sql; 532 533 return $wpdb->get_col( $sql ); 531 return $do_query ? $wpdb->get_col( $sql ) : $sql; 534 532 } 535 533
Note: See TracChangeset
for help on using the changeset viewer.