WordPress.org

Make WordPress Core

Changeset 30344


Ignore:
Timestamp:
11/14/2014 09:26:48 PM (4 years ago)
Author:
boonebgorges
Message:

Reinstate term splitting on term update.

Originally introduced in [30241] and reverted in [30336], term splitting is
back and better than ever. Now with *more unit tests* and *improved treatment
of child terms*!

See #30335.

Location:
trunk
Files:
1 added
2 edited

Legend:

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

    r30336 r30344  
    33873387    $tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
    33883388
     3389    // Check whether this is a shared term that needs splitting.
     3390    $_term_id = _split_shared_term( $term_id, $tt_id );
     3391    if ( ! is_wp_error( $_term_id ) ) {
     3392        $term_id = $_term_id;
     3393    }
     3394
    33893395    /**
    33903396     * Fires immediately before the given terms are edited.
     
    40384044        do_action( 'edited_term_taxonomy', $term, $taxonomy );
    40394045    }
     4046}
     4047
     4048/**
     4049 * Create a new term for a term_taxonomy item that currently shares its term.
     4050 *
     4051 * @since 4.1.0
     4052 * @access private
     4053 *
     4054 * @param int   $term_id          ID of the shared term.
     4055 * @param int   $term_taxonomy_id ID of the term taxonomy item to receive a new term.
     4056 * @param array $shared_tts       Sibling term taxonomies, used for busting caches.
     4057 * @return int  Term ID.
     4058 */
     4059function _split_shared_term( $term_id, $term_taxonomy_id ) {
     4060    global $wpdb;
     4061
     4062    // Don't try to split terms if database schema does not support shared slugs.
     4063    $current_db_version = get_option( 'db_version' );
     4064    if ( $current_db_version < 30133 ) {
     4065        return $term_id;
     4066    }
     4067
     4068    // If there are no shared term_taxonomy rows, there's nothing to do here.
     4069    $shared_tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) );
     4070    if ( ! $shared_tt_count ) {
     4071        return $term_id;
     4072    }
     4073
     4074    // Pull up data about the currently shared slug, which we'll use to populate the new one.
     4075    $shared_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id ) );
     4076
     4077    $new_term_data = array(
     4078        'name' => $shared_term->name,
     4079        'slug' => $shared_term->slug,
     4080        'term_group' => $shared_term->term_group,
     4081    );
     4082
     4083    if ( false === $wpdb->insert( $wpdb->terms, $new_term_data ) ) {
     4084        return new WP_Error( 'db_insert_error', __( 'Could not split shared term.' ), $wpdb->last_error );
     4085    }
     4086
     4087    $new_term_id = (int) $wpdb->insert_id;
     4088
     4089    // Update the existing term_taxonomy to point to the newly created term.
     4090    $wpdb->update( $wpdb->term_taxonomy,
     4091        array( 'term_id' => $new_term_id ),
     4092        array( 'term_taxonomy_id' => $term_taxonomy_id )
     4093    );
     4094
     4095    // Reassign child terms to the new parent.
     4096    $term_taxonomy = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
     4097    $children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE taxonomy = %s AND parent = %d", $term_taxonomy->taxonomy, $term_id ) );
     4098
     4099    foreach ( $children_tt_ids as $child_tt_id ) {
     4100        $wpdb->update( $wpdb->term_taxonomy,
     4101            array( 'parent' => $new_term_id ),
     4102            array( 'term_taxonomy_id' => $child_tt_id )
     4103        );
     4104        clean_term_cache( $term_id, $term_taxonomy->taxonomy );
     4105    }
     4106
     4107    // Clean the cache for term taxonomies formerly shared with the current term.
     4108    $shared_term_taxonomies = $wpdb->get_row( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
     4109    foreach ( (array) $shared_term_taxonomies as $shared_term_taxonomy ) {
     4110        clean_term_cache( $term_id, $shared_term_taxonomy );
     4111    }
     4112
     4113    /**
     4114     * Fires after a previously shared taxonomy term is split into two separate terms.
     4115     *
     4116     * @since 4.1.0
     4117     *
     4118     * @param int $term_id          ID of the formerly shared term.
     4119     * @param int $new_term_id      ID of the new term created for the $term_taxonomy_id.
     4120     * @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split.
     4121     */
     4122    do_action( 'split_shared_term', $term_id, $new_term_id, $term_taxonomy_id );
     4123
     4124    return $new_term_id;
    40404125}
    40414126
  • trunk/tests/phpunit/tests/term.php

    r30336 r30344  
    691691    }
    692692
     693    /**
     694     * @ticket 5809
     695     */
     696    public function test_wp_update_term_should_split_shared_term() {
     697        global $wpdb;
     698
     699        register_taxonomy( 'wptests_tax', 'post' );
     700        register_taxonomy( 'wptests_tax_2', 'post' );
     701
     702        $t1 = wp_insert_term( 'Foo', 'wptests_tax' );
     703        $t2 = wp_insert_term( 'Foo', 'wptests_tax_2' );
     704
     705        // Manually modify because split terms shouldn't naturally occur.
     706        $wpdb->update( $wpdb->term_taxonomy,
     707            array( 'term_id' => $t1['term_id'] ),
     708            array( 'term_taxonomy_id' => $t2['term_taxonomy_id'] ),
     709            array( '%d' ),
     710            array( '%d' )
     711        );
     712
     713        $posts = $this->factory->post->create_many( 2 );
     714        wp_set_object_terms( $posts[0], array( 'Foo' ), 'wptests_tax' );
     715        wp_set_object_terms( $posts[1], array( 'Foo' ), 'wptests_tax_2' );
     716
     717        // Verify that the terms are shared.
     718        $t1_terms = wp_get_object_terms( $posts[0], 'wptests_tax' );
     719        $t2_terms = wp_get_object_terms( $posts[1], 'wptests_tax_2' );
     720        $this->assertSame( $t1_terms[0]->term_id, $t2_terms[0]->term_id );
     721
     722        wp_update_term( $t2_terms[0]->term_id, 'wptests_tax_2', array(
     723            'name' => 'New Foo',
     724        ) );
     725
     726        $t1_terms = wp_get_object_terms( $posts[0], 'wptests_tax' );
     727        $t2_terms = wp_get_object_terms( $posts[1], 'wptests_tax_2' );
     728        $this->assertNotEquals( $t1_terms[0]->term_id, $t2_terms[0]->term_id );
     729    }
     730
     731    /**
     732     * @ticket 5809
     733     */
     734    public function test_wp_update_term_should_not_split_shared_term_before_410_schema_change() {
     735        global $wpdb;
     736
     737        $db_version = get_option( 'db_version' );
     738        update_option( 'db_version', 30055 );
     739
     740        register_taxonomy( 'wptests_tax', 'post' );
     741        register_taxonomy( 'wptests_tax_2', 'post' );
     742
     743        $t1 = wp_insert_term( 'Foo', 'wptests_tax' );
     744        $t2 = wp_insert_term( 'Foo', 'wptests_tax_2' );
     745
     746        // Manually modify because split terms shouldn't naturally occur.
     747        $wpdb->update( $wpdb->term_taxonomy,
     748            array( 'term_id' => $t1['term_id'] ),
     749            array( 'term_taxonomy_id' => $t2['term_taxonomy_id'] ),
     750            array( '%d' ),
     751            array( '%d' )
     752        );
     753
     754        $posts = $this->factory->post->create_many( 2 );
     755        wp_set_object_terms( $posts[0], array( 'Foo' ), 'wptests_tax' );
     756        wp_set_object_terms( $posts[1], array( 'Foo' ), 'wptests_tax_2' );
     757
     758        // Verify that the term is shared.
     759        $t1_terms = wp_get_object_terms( $posts[0], 'wptests_tax' );
     760        $t2_terms = wp_get_object_terms( $posts[1], 'wptests_tax_2' );
     761        $this->assertSame( $t1_terms[0]->term_id, $t2_terms[0]->term_id );
     762
     763        wp_update_term( $t2_terms[0]->term_id, 'wptests_tax_2', array(
     764            'name' => 'New Foo',
     765        ) );
     766
     767        // Term should still be shared.
     768        $t1_terms = wp_get_object_terms( $posts[0], 'wptests_tax' );
     769        $t2_terms = wp_get_object_terms( $posts[1], 'wptests_tax_2' );
     770        $this->assertSame( $t1_terms[0]->term_id, $t2_terms[0]->term_id );
     771
     772        update_option( 'db_version', $db_version );
     773    }
     774
    693775    public function test_wp_update_term_alias_of_no_term_group() {
    694776        register_taxonomy( 'wptests_tax', 'post' );
Note: See TracChangeset for help on using the changeset viewer.