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

Timestamp:

10/10/2017 04:45:01 PM (9 years ago)

Author:

boonebgorges

Message:

Taxonomy: Don't discard keys when merging queried terms from different taxonomies.

For values of fields like id=>parent, the keys of the array must be
maintained as part of the query results.

Introduced as part of #40496. See [38667], [40513].

Props miyauchi, dany2217, pcarvalho.
Fixes #41293.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1913 +1913 @@
         // Taxonomies registered without an 'args' param are handled here.
         if ( ! empty( $taxonomies ) ) {
-                $terms = array_merge( $terms, get_terms( $args ) );
+                $terms_from_remaining_taxonomies = get_terms( $args );
+
+                // Array keys should be preserved for values of $fields that use term_id for keys.
+                if ( ! empty( $args['fields'] ) && 0 === strpos( $args['fields'], 'id=>' ) ) {
+                        $terms = $terms + $terms_from_remaining_taxonomies;
+                } else {
+                        $terms = array_merge( $terms, $terms_from_remaining_taxonomies );
+                }
         }