Changeset 10276 for branches/2.7/wp-includes/taxonomy.php

Timestamp:

12/30/2008 10:30:54 PM (18 years ago)

Author:

ryan

Message:

Add exclude_tree for categories. Make exclude behave like exclude_tree when hierarchical to restore < 2.7 behavior. Props filosofo. fixes #8614 for 2.7

File:

• branches/2.7/wp-includes/taxonomy.php (modified) (4 diffs)

branches/2.7/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.
@@ -605 +609 @@
 
         $defaults = array('orderby' => 'name', 'order' => 'ASC',
-                'hide_empty' => true, 'exclude' => '', 'include' => '',
+                'hide_empty' => true, 'exclude' => '', 'exclude_tree' => '', 'include' => '',
                 'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
                 'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '',
@@ -669 +673 @@
         if ( !empty($include) ) {
                 $exclude = '';
+                $exclude_tree = '';
                 $interms = preg_split('/[\s,]+/',$include);
                 if ( count($interms) ) {
@@ -685 +690 @@
 
         $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