Changeset 25933 for trunk

Timestamp:

10/26/2013 03:03:10 PM (11 years ago)

Author:

nacin

Message:

Fix the exclude_tree argument in get_terms(), which fixes the exclude argument in wp_list_categories().

This was a 3.7 regression caused by [25162].

props dd32.
see #25710 for trunk.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/getTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1363 +1363 @@
     if ( ! empty( $exclude_tree ) ) {
         $exclude_tree = wp_parse_id_list( $exclude_tree );
-        $excluded_children = array();
+        $excluded_children = $exclude_tree;
         foreach ( $exclude_tree as $extrunk ) {
             $excluded_children = array_merge(

trunk/tests/phpunit/tests/term/getTerms.php

@@ -153 +153 @@
 
     /**
+     * @ticket 25710
+     */
+    function test_get_terms_exclude_tree() {
+
+        $term_id_uncategorized = get_option( 'default_category' );
+
+        $term_id1 = $this->factory->category->create();
+        $term_id11 = $this->factory->category->create( array( 'parent' => $term_id1 ) );
+        $term_id2 = $this->factory->category->create();
+        $term_id22 = $this->factory->category->create( array( 'parent' => $term_id2 ) );
+
+        // There's something else broken in the cache cleaning routines that leads to this having to be done manually
+        delete_option( 'category_children' );
+
+        $terms = get_terms( 'category', array(
+            'exclude' => $term_id_uncategorized,
+            'fields' => 'ids',
+            'hide_empty' => false,
+        ) );
+        $this->assertEquals( array( $term_id1, $term_id11, $term_id2, $term_id22 ), $terms );
+
+        $terms = get_terms( 'category', array(
+            'fields' => 'ids',
+            'exclude_tree' => "$term_id1,$term_id_uncategorized",
+            'hide_empty' => false,
+        ) );
+
+        $this->assertEquals( array( $term_id2, $term_id22 ), $terms );
+
+    }
+
+    /**
      * @ticket 13992
      */