Changeset 13787

Timestamp:

03/21/2010 02:52:00 AM (15 years ago)

Author:

dd32

Message:

When viewing a Parent term in a hierarchical taxonomy, display objects contained within children too. Props scribu. Fixes #12533

File:

• trunk/wp-includes/query.php (modified) (23 diffs)

trunk/wp-includes/query.php

@@ -95 +95 @@
  * @return bool True if page is archive.
  */
-function is_archive () {
+function is_archive() {
     global $wp_query;
 
@@ -109 +109 @@
  * @return bool True if page is attachment.
  */
-function is_attachment () {
+function is_attachment() {
     global $wp_query;
 
@@ -269 +269 @@
  * @return bool
  */
-function is_comments_popup () {
+function is_comments_popup() {
     global $wp_query;
 
@@ -283 +283 @@
  * @return bool
  */
-function is_date () {
+function is_date() {
     global $wp_query;
 
@@ -297 +297 @@
  * @return bool
  */
-function is_day () {
+function is_day() {
     global $wp_query;
 
@@ -311 +311 @@
  * @return bool
  */
-function is_feed () {
+function is_feed() {
     global $wp_query;
 
@@ -325 +325 @@
  * @return bool
  */
-function is_comment_feed () {
+function is_comment_feed() {
     global $wp_query;
 
@@ -340 +340 @@
  * @return bool True, if front of site.
  */
-function is_front_page () {
+function is_front_page() {
     // most likely case
     if ( 'posts' == get_option('show_on_front') && is_home() )
@@ -362 +362 @@
  * @return bool True if blog view homepage.
  */
-function is_home () {
+function is_home() {
     global $wp_query;
 
@@ -376 +376 @@
  * @return bool
  */
-function is_month () {
+function is_month() {
     global $wp_query;
 
@@ -430 +430 @@
  * @return bool
  */
-function is_paged () {
+function is_paged() {
     global $wp_query;
 
@@ -492 +492 @@
  * @return bool
  */
-function is_search () {
+function is_search() {
     global $wp_query;
 
@@ -513 +513 @@
  * @return bool
  */
-function is_single ($post = '') {
+function is_single($post = '') {
     global $wp_query;
 
@@ -558 +558 @@
  * @return bool
  */
-function is_time () {
+function is_time() {
     global $wp_query;
 
@@ -572 +572 @@
  * @return bool
  */
-function is_trackback () {
+function is_trackback() {
     global $wp_query;
 
@@ -586 +586 @@
  * @return bool
  */
-function is_year () {
+function is_year() {
     global $wp_query;
 
@@ -600 +600 @@
  * @return bool True, if nothing is found matching WordPress Query.
  */
-function is_404 () {
+function is_404() {
     global $wp_query;
 
@@ -1135 +1135 @@
      * @access public
      */
-    function init () {
+    function init() {
         unset($this->posts);
         unset($this->query);
@@ -1228 +1228 @@
      * @param string|array $query
      */
-    function parse_query ($query) {
+    function parse_query($query) {
         if ( !empty($query) || !isset($this->query) ) {
             $this->init();
@@ -1997 +1997 @@
                 $taxonomy = $q['taxonomy'];
                 $tt[$taxonomy] = $q['term'];
-                $terms = get_terms($q['taxonomy'], array('slug'=>$q['term']));
             } else {
                 foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
                     if ( $t->query_var && '' != $q[$t->query_var] ) {
-                        $terms = get_terms($taxonomy, array('slug'=>$q[$t->query_var]));
-                        if ( !is_wp_error($terms) )
-                            break;
+                        $tt[$taxonomy] = $q[$t->query_var];
+                        break;
                     }
                 }
             }
+
+            $terms = get_terms($taxonomy, array('slug' => $tt[$taxonomy], 'hide_empty' => !is_taxonomy_hierarchical($taxonomy)));
+
             if ( is_wp_error($terms) || empty($terms) ) {
                 $whichcat = " AND 0 ";
             } else {
-                foreach ( $terms as $term )
+                foreach ( $terms as $term ) {
                     $term_ids[] = $term->term_id;
+                    if ( is_taxonomy_hierarchical($taxonomy) ) {
+                        $children = get_term_children($term->term_id, $taxonomy);
+                        $term_ids = array_merge($term_ids, $children);
+                    }
+                }
                 $post_ids = get_objects_in_term($term_ids, $taxonomy);
-                if ( !is_wp_error($post_ids) && count($post_ids) ) {
+                if ( !is_wp_error($post_ids) && !empty($post_ids) ) {
                     $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
                     $post_type = 'any';
@@ -2735 +2741 @@
      * @return WP_Query
      */
-    function WP_Query ($query = '') {
+    function WP_Query($query = '') {
         if (! empty($query)) {
             $this->query($query);
@@ -2753 +2759 @@
  * @return null If no link is found, null is returned.
  */
-function wp_old_slug_redirect () {
+function wp_old_slug_redirect() {
     global $wp_query;
     if ( is_404() && '' != $wp_query->query_vars['name'] ) :
@@ -2827 +2833 @@
     return true;
 }
-
 ?>