Changes from branches/2.7/wp-includes/taxonomy.php at r10417 to trunk/wp-includes/taxonomy.php at r10159

File:

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

trunk/wp-includes/taxonomy.php

@@ -535 +535 @@
  * 'exclude' is ignored.
  *
- * exclude_tree - A comma- or space-delimited string of term ids to exclude
- * from the return array, along with all of their descendant terms according to 
- * the primary taxonomy.  If 'include' is non-empty, 'exclude_tree' is ignored.
- *
  * include - Default is an empty string.  A comma- or space-delimited string
  * of term ids to include in the return array.
@@ -609 +605 @@
 
     $defaults = array('orderby' => 'name', 'order' => 'ASC',
-        'hide_empty' => true, 'exclude' => '', 'exclude_tree' => '', 'include' => '',
+        'hide_empty' => true, 'exclude' => '', 'include' => '',
         'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
         'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '',
@@ -673 +669 @@
     if ( !empty($include) ) {
         $exclude = '';
-        $exclude_tree = '';
         $interms = preg_split('/[\s,]+/',$include);
         if ( count($interms) ) {
@@ -690 +685 @@
 
     $exclusions = '';
-    if ( ! empty( $exclude_tree ) ) {
-        $excluded_trunks = preg_split('/[\s,]+/',$exclude_tree);
-        foreach( (array) $excluded_trunks as $extrunk ) {
-            $excluded_children = (array) get_terms($taxonomies[0], array('child_of' => intval($extrunk), 'fields' => 'ids'));   
-            $excluded_children[] = $extrunk;
-            foreach( (array) $excluded_children as $exterm ) {
-                if ( empty($exclusions) )
-                    $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
-                else
-                    $exclusions .= ' AND t.term_id <> ' . intval($exterm) . ' ';
-
-            }
-        }
-    }
     if ( !empty($exclude) ) {
         $exterms = preg_split('/[\s,]+/',$exclude);
         if ( count($exterms) ) {
             foreach ( (array) $exterms as $exterm ) {
-                if ( empty($exclusions) )
+                if (empty($exclusions))
                     $exclusions = ' AND ( t.term_id <> ' . intval($exterm) . ' ';
                 else
@@ -737 +718 @@
         $where .= ' AND tt.count > 0';
 
-    // don't limit the query results when we have to descend the family tree 
-    if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' == $parent ) {
+    if ( !empty($number) ) {
         if( $offset )
-            $limit = 'LIMIT ' . $offset . ',' . $number;
+            $number = 'LIMIT ' . $offset . ',' . $number;
         else
-            $limit = 'LIMIT ' . $number;
+            $number = 'LIMIT ' . $number;
 
     } else
-        $limit = '';
+        $number = '';
 
     if ( !empty($search) ) {
@@ -760 +740 @@
         $select_this = 't.term_id, tt.parent, tt.count, t.name';
 
-    $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $limit";
-
-    $terms = $wpdb->get_results($query);
+    $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where ORDER BY $orderby $order $number";
+
     if ( 'all' == $fields ) {
+        $terms = $wpdb->get_results($query);
         update_term_cache($terms);
+    } else if ( ('ids' == $fields) || ('names' == $fields) ) {
+        $terms = $wpdb->get_results($query);
     }
 
@@ -810 +792 @@
             $_terms[] = $term->name;
         $terms = $_terms;
-    }
-
-    if ( 0 < $number && intval(@count($terms)) > $number ) {
-        $terms = array_slice($terms, $offset, $number);
     }