Changeset 31275 for trunk/src/wp-includes/taxonomy.php

Timestamp:

01/24/2015 06:47:30 PM (10 years ago)

Author:

boonebgorges

Message:

Introduce 'childless' parameter to get_terms().

This new parameter allows developers to limit queried terms to terminal nodes -
ie, those without any descendants.

As part of the improvement, some internal logic in get_terms() has been
consolidated. Parameters that resolve to a NOT IN clause containing term IDs
('exclude', 'exclude_tree', and 'childless') are now parsed into a single
"exclusions" array before the SQL clause is generated.

Props theMikeD, horike.
Fixes #29839.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1548 +1548 @@
  *
  * @since 2.3.0
- * @since 4.2.0 Introduced 'name' parameter.
+ * @since 4.2.0 Introduced 'name' and 'childless' parameters.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -1596 +1596 @@
  *                                           are passed, $child_of is ignored. Default 0.
  *     @type int|string   $parent            Parent term ID to retrieve direct-child terms of. Default empty.
+ *     @type bool         $childless         True to limit results to terms that have no children. This parameter has
+ *                                           no effect on non-hierarchical taxonomies. Default false.
  *     @type string       $cache_domain      Unique cache key to be produced when this query is stored in an
  *                                           object cache. Default is 'core'.
@@ -1620 +1622 @@
     $defaults = array('orderby' => 'name', 'order' => 'ASC',
         'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
-        'number' => '', 'fields' => 'all', 'name' => '', 'slug' => '', 'parent' => '',
+        'number' => '', 'fields' => 'all', 'name' => '', 'slug' => '', 'parent' => '', 'childless' => false,
         'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '', 'description__like' => '',
         'pad_counts' => false, 'offset' => '', 'search' => '', 'cache_domain' => 'core' );
@@ -1639 +1641 @@
 
     if ( 'all' == $args['get'] ) {
+        $args['childless'] = false;
         $args['child_of'] = 0;
         $args['hide_empty'] = 0;
@@ -1755 +1758 @@
     }
 
+    $exclusions = array();
     if ( ! empty( $exclude_tree ) ) {
         $exclude_tree = wp_parse_id_list( $exclude_tree );
@@ -1764 +1768 @@
             );
         }
-        $exclusions = implode( ',', array_map( 'intval', $excluded_children ) );
-    } else {
-        $exclusions = '';
+        $exclusions = array_merge( $excluded_children, $exclusions );
     }
 
     if ( ! empty( $exclude ) ) {
-        $exterms = wp_parse_id_list( $exclude );
-        if ( empty( $exclusions ) ) {
-            $exclusions = implode( ',', $exterms );
-        } else {
-            $exclusions .= ', ' . implode( ',', $exterms );
+        $exclusions = array_merge( wp_parse_id_list( $exclude ), $exclusions );
+    }
+
+    // 'childless' terms are those without an entry in the flattened term hierarchy.
+    $childless = (bool) $args['childless'];
+    if ( $childless ) {
+        foreach ( $taxonomies as $_tax ) {
+            $term_hierarchy = _get_term_hierarchy( $_tax );
+            $exclusions = array_merge( array_keys( $term_hierarchy ), $exclusions );
         }
     }
 
     if ( ! empty( $exclusions ) ) {
-        $exclusions = ' AND t.term_id NOT IN (' . $exclusions . ')';
+        $exclusions = ' AND t.term_id NOT IN (' . implode( ',', array_map( 'intval', $exclusions ) ) . ')';
     }