WordPress.org

Make WordPress Core

Changeset 40513 for trunk


Ignore:
Timestamp:
04/21/2017 07:13:51 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.

Props danielbachhuber.
Fixes #40496.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/taxonomy.php

    r40353 r40513  
    18421842    $args = wp_parse_args( $args );
    18431843
     1844    /*
     1845     * When one or more queried taxonomies is registered with an 'args' array,
     1846     * those params override the `$args` passed to this function.
     1847     */
     1848    $terms = array();
     1849    if ( count( $taxonomies ) > 1 ) {
     1850        foreach ( $taxonomies as $index => $taxonomy ) {
     1851            $t = get_taxonomy( $taxonomy );
     1852            if ( isset( $t->args ) && is_array( $t->args ) && $args != array_merge( $args, $t->args ) ) {
     1853                unset( $taxonomies[ $index ] );
     1854                $terms = array_merge( $terms, wp_get_object_terms( $object_ids, $taxonomy, array_merge( $args, $t->args ) ) );
     1855            }
     1856        }
     1857    } else {
     1858        $t = get_taxonomy( $taxonomies[0] );
     1859        if ( isset( $t->args ) && is_array( $t->args ) ) {
     1860            $args = array_merge( $args, $t->args );
     1861        }
     1862    }
     1863
    18441864    $args['taxonomy'] = $taxonomies;
    18451865    $args['object_ids'] = $object_ids;
    18461866
    1847     $terms = get_terms( $args );
     1867    $terms = array_merge( $terms, get_terms( $args ) );
    18481868
    18491869    /**
  • trunk/tests/phpunit/tests/term/query.php

    r38784 r40513  
    382382        $this->assertEquals( 1, $count );
    383383    }
     384
     385    /**
     386     * @ticket 40496
     387     */
     388    public function test_get_the_terms_should_respect_taxonomy_orderby() {
     389        register_taxonomy( 'wptests_tax', 'post', array(
     390            'sort' => true,
     391            'args' => array(
     392                'orderby' => 'term_order',
     393            ),
     394        ) );
     395        $term_ids = self::factory()->term->create_many( 2, array(
     396            'taxonomy' => 'wptests_tax',
     397        ) );
     398        $post_id = self::factory()->post->create();
     399        wp_set_object_terms( $post_id, array( $term_ids[0], $term_ids[1] ), 'wptests_tax' );
     400        $terms = get_the_terms( $post_id, 'wptests_tax' );
     401        $this->assertEquals( array( $term_ids[0], $term_ids[1] ), wp_list_pluck( $terms, 'term_id' ) );
     402        // Flip the order
     403        wp_set_object_terms( $post_id, array( $term_ids[1], $term_ids[0] ), 'wptests_tax' );
     404        $terms = get_the_terms( $post_id, 'wptests_tax' );
     405        $this->assertEquals( array( $term_ids[1], $term_ids[0] ), wp_list_pluck( $terms, 'term_id' ) );
     406    }
     407
     408    /**
     409     * @ticket 40496
     410     */
     411    public function test_wp_get_object_terms_should_respect_taxonomy_orderby() {
     412        register_taxonomy( 'wptests_tax', 'post', array(
     413            'sort' => true,
     414            'args' => array(
     415                'orderby' => 'term_order',
     416            ),
     417        ) );
     418        $term_ids = self::factory()->term->create_many( 2, array(
     419            'taxonomy' => 'wptests_tax',
     420        ) );
     421        $post_id = self::factory()->post->create();
     422        wp_set_object_terms( $post_id, array( $term_ids[0], $term_ids[1] ), 'wptests_tax' );
     423        $terms = wp_get_object_terms( $post_id, array( 'category', 'wptests_tax' ) );
     424        $this->assertEquals( array( $term_ids[0], $term_ids[1], 1 ), wp_list_pluck( $terms, 'term_id' ) );
     425        // Flip the order
     426        wp_set_object_terms( $post_id, array( $term_ids[1], $term_ids[0] ), 'wptests_tax' );
     427        $terms = wp_get_object_terms( $post_id, array( 'category', 'wptests_tax' ) );
     428        $this->assertEquals( array( $term_ids[1], $term_ids[0], 1 ), wp_list_pluck( $terms, 'term_id' ) );
     429    }
    384430}
Note: See TracChangeset for help on using the changeset viewer.