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

Timestamp:

01/25/2015 02:45:11 AM (12 years ago)

Author:

boonebgorges

Message:

In get_terms(), check hierarchy for all $taxonomies before bailing early from 'parent' or 'child_of'.

There is a pre-check in get_terms() that prevents an unnecessary database
query if the 'parent' or 'child_of' parameter is not found in the cached term
hierarchy (since a term without an index in the hierarchy cache has no
descendants). Previously, only the first item in the $taxonomies array was
being checked, with the result that an empty array was being erroneously
returned in cases where the 'parent' or 'child_of' term is in a subsequent
taxonomy.

See #31118.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1658 +1658 @@
         $args = apply_filters( 'get_terms_args', $args, $taxonomies );
 
+        // Avoid the query if the queried parent/child_of term has no descendants.
         $child_of = $args['child_of'];
+        $parent   = $args['parent'];
+
         if ( $child_of ) {
-                $hierarchy = _get_term_hierarchy( reset( $taxonomies ) );
-                if ( ! isset( $hierarchy[ $child_of ] ) ) {
-                        return $empty_array;
-                }
-        }
-
-        $parent = $args['parent'];
-        if ( $parent ) {
-                $hierarchy = _get_term_hierarchy( reset( $taxonomies ) );
-                if ( ! isset( $hierarchy[ $parent ] ) ) {
+                $_parent = $child_of;
+        } elseif ( $parent ) {
+                $_parent = $parent;
+        } else {
+                $_parent = false;
+        }
+
+        if ( $_parent ) {
+                $in_hierarchy = false;
+                foreach ( $taxonomies as $_tax ) {
+                        $hierarchy = _get_term_hierarchy( $_tax );
+
+                        if ( isset( $hierarchy[ $_parent ] ) ) {
+                                $in_hierarchy = true;
+                        }
+                }
+
+                if ( ! $in_hierarchy ) {
                         return $empty_array;
                 }
@@ -1943 +1954 @@
 
         if ( $child_of ) {
-                $children = _get_term_hierarchy( reset( $taxonomies ) );
-                if ( ! empty( $children ) ) {
-                        $terms = _get_term_children( $child_of, $terms, reset( $taxonomies ) );
+                foreach ( $taxonomies as $_tax ) {
+                        $children = _get_term_hierarchy( $_tax );
+                        if ( ! empty( $children ) ) {
+                                $terms = _get_term_children( $child_of, $terms, $_tax );
+                        }
                 }
         }