WordPress.org

Make WordPress Core


Ignore:
Timestamp:
04/21/2017 07:18:00 PM (2 years ago)
Author:
boonebgorges
Message:

Restore support for taxonomy 'args' override when querying object terms.

[7520] introduced an undocumented feature whereby developers could
register a custom taxonomy with an 'args' parameter, consisting of
an array of config params that, when present, override corresponding
params in the $args array passed to wp_get_object_terms() when
using that function to query for terms in the specified taxonomy.

The wp_get_object_terms() refactor in [38667] failed to respect
this secret covenant, and the current changeset atones for the
transgression.

Ports [40513] to the 4.7 branch.

Props danielbachhuber.
Fixes #40496.

Location:
branches/4.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.7

  • branches/4.7/src/wp-includes/taxonomy.php

    r40354 r40514  
    18741874    $args = wp_parse_args( $args );
    18751875
     1876    /*
     1877     * When one or more queried taxonomies is registered with an 'args' array,
     1878     * those params override the `$args` passed to this function.
     1879     */
     1880    $terms = array();
     1881    if ( count( $taxonomies ) > 1 ) {
     1882        foreach ( $taxonomies as $index => $taxonomy ) {
     1883            $t = get_taxonomy( $taxonomy );
     1884            if ( isset( $t->args ) && is_array( $t->args ) && $args != array_merge( $args, $t->args ) ) {
     1885                unset( $taxonomies[ $index ] );
     1886                $terms = array_merge( $terms, wp_get_object_terms( $object_ids, $taxonomy, array_merge( $args, $t->args ) ) );
     1887            }
     1888        }
     1889    } else {
     1890        $t = get_taxonomy( $taxonomies[0] );
     1891        if ( isset( $t->args ) && is_array( $t->args ) ) {
     1892            $args = array_merge( $args, $t->args );
     1893        }
     1894    }
     1895
    18761896    $args['taxonomy'] = $taxonomies;
    18771897    $args['object_ids'] = $object_ids;
    18781898
    1879     $terms = get_terms( $args );
     1899    $terms = array_merge( $terms, get_terms( $args ) );
    18801900
    18811901    /**
Note: See TracChangeset for help on using the changeset viewer.