Changeset 10275

Timestamp:

12/30/2008 10:30:36 PM (16 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 trunk

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (3 diffs)
• taxonomy.php (modified) (4 diffs)

trunk/wp-includes/category-template.php

@@ -446 +446 @@
  *     'child_of' (int) default is 0 - See {@link get_categories()}.
  *     'exclude' (string) - See {@link get_categories()}.
+ *     'exclude_tree' (string) - See {@link get_categories()}.
  *     'echo' (bool|int) default is 1 - Whether to display or retrieve content.
  *     'current_category' (int) - See {@link get_categories()}.
@@ -464 +465 @@
         'hide_empty' => 1, 'use_desc_for_title' => 1,
         'child_of' => 0, 'feed' => '', 'feed_type' => '',
-        'feed_image' => '', 'exclude' => '', 'current_category' => 0,
+        'feed_image' => '', 'exclude' => '', 'exclude_tree' => '', 'current_category' => 0,
         'hierarchical' => true, 'title_li' => __( 'Categories' ),
         'echo' => 1, 'depth' => 0
@@ -477 +478 @@
     if ( isset( $r['show_date'] ) ) {
         $r['include_last_update_time'] = $r['show_date'];
+    }
+
+    if ( true == $r['hierarchical'] ) {
+        $r['exclude_tree'] = $r['exclude'];
+        $r['exclude'] = '';
     }
 

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.
@@ -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