Changeset 34696 for trunk/src/wp-includes/category-template.php

Timestamp:

09/29/2015 07:11:12 PM (9 years ago)

Author:

boonebgorges

Message:

Fix 'exclude_tree' in wp_list_categories().

The 'exclude_tree' parameter must be compatible with 'hierarchical';
previously, 'hierarchical' canceled it out. This changeset also makes it so
that 'exclude_tree' is compatible with 'exclude'. When both are passed, and
'hierarchical' is true, the descendant trees of terms in both parameters will
be excluded from matched terms.

Props tott, webord, MikeHansenMe.
Fixes #12981.

File:

• trunk/src/wp-includes/category-template.php (modified) (2 diffs)

trunk/src/wp-includes/category-template.php

@@ -499 +499 @@
  *     @type int          $child_of              Term ID to retrieve child terms of. See {@link get_terms()}. Default 0.
  *     @type array|string $exclude               Array or comma/space-separated string of term IDs to exclude.
- *                                               See {@link get_terms()}. Default empty string.
+ *                                               If `$hierarchical` is true, descendants of `$exclude` terms will also
+ *                                               be excluded; see `$exclude_tree`. See {@link get_terms()}.
+ *                                               Default empty string.
  *     @type array|string $exclude_tree          Array or comma/space-separated string of term IDs to exclude, along
  *                                               with their descendants. See {@link get_terms()}. Default empty string.
@@ -537 +539 @@
         $r['pad_counts'] = true;
 
+    // Descendants of exclusions should be excluded too.
     if ( true == $r['hierarchical'] ) {
-        $r['exclude_tree'] = $r['exclude'];
+        $exclude_tree = array();
+
+        if ( $r['exclude_tree'] ) {
+            $exclude_tree = array_merge( $exclude_tree, (array) $r['exclude_tree'] );
+        }
+
+        if ( $r['exclude'] ) {
+            $exclude_tree = array_merge( $exclude_tree, (array) $r['exclude'] );
+        }
+
+        $r['exclude_tree'] = $exclude_tree;
         $r['exclude'] = '';
     }