Changeset 5660

Timestamp:

06/06/2007 04:13:12 PM (19 years ago)

Author:

ryan

Message:

Use get_term_children() and get_term_field(). see #4189

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (1 diff)
• query.php (modified) (1 diff)

trunk/wp-includes/category-template.php

@@ -173 +173 @@
         if ( !$category )
                 $category = $cat;
-        $category = & get_category($category);
-        return apply_filters('category_description', $category->description, $category->term_id);
+
+        return get_term_field('description', $category, 'category');
 }
 

trunk/wp-includes/query.php

@@ -916 +916 @@
                         $join = " LEFT JOIN $wpdb->term_relationships ON ($wpdb->posts.ID = $wpdb->term_relationships.object_id) LEFT JOIN $wpdb->term_taxonomy ON ($wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id) ";
                         $whichcat = " AND $wpdb->term_taxonomy.taxonomy = 'category' ";
-                        $whichcat .= "AND $wpdb->term_taxonomy.term_id IN ({$q['cat']}, ";
-                        $whichcat .= get_category_children($q['cat'], '', ', ');
-                        $whichcat = substr($whichcat, 0, -2);
-                        $whichcat .= ")";
+                        $in_cats = array($q['cat']);
+                        $in_cats = array_merge($in_cats, get_term_children($q['cat'], 'category'));
+                        $in_cats = "'" . implode("', '", $in_cats) . "'";
+                        $whichcat .= "AND $wpdb->term_taxonomy.term_id IN ($in_cats)";
                         $groupby = "{$wpdb->posts}.ID";
                 }
-
-
 
                 // Author/user stuff