Changeset 31378

Timestamp:

02/09/2015 03:58:35 AM (10 years ago)

Author:

dd32

Message:

In wp_update_term(), limit duplicate slug checks to the same taxonomy as the updated term.

In 4.1 [30240], wp_insert_term() was modified to allow the creation of terms
with duplicate slugs, as long as the terms are in different taxonomies.
wp_update_term() didn't get the corresponding modification, with the result
that term updates fail when the term being updated shares a slug with an older
term, regardless of that older term's taxonomy.

Props ipm-frommen.
Merges [30985] to the 4.1 branch.
Fixes #30780.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term.php (modified) (5 diffs)

branches/4.1/src/wp-includes/taxonomy.php

@@ -3354 +3354 @@
 
     // Check for duplicate slug
-    $id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE slug = %s", $slug ) );
-    if ( $id && ($id != $term_id) ) {
+    $duplicate = get_term_by( 'slug', $slug, $taxonomy );
+    if ( $duplicate && $duplicate->term_id != $term_id ) {
         // If an empty slug was passed or the parent changed, reset the slug to something unique.
         // Otherwise, bail.

branches/4.1/tests/phpunit/tests/term.php

@@ -641 +641 @@
      * @ticket 5809
      */
-    public function test_wp_update_term_duplicate_slug_same_taxonomy() {
+    public function test_wp_update_term_should_not_create_duplicate_slugs_within_the_same_taxonomy() {
         register_taxonomy( 'wptests_tax', 'post' );
 
@@ -651 +651 @@
 
         $t2 = $this->factory->term->create( array(
-            'name' => 'Foo',
+            'name' => 'Bar',
             'slug' => 'bar',
             'taxonomy' => 'wptests_tax',
@@ -667 +667 @@
      * @ticket 5809
      */
-    public function test_wp_update_term_duplicate_slug_different_taxonomy() {
+    public function test_wp_update_term_should_allow_duplicate_slugs_in_different_taxonomy() {
         register_taxonomy( 'wptests_tax', 'post' );
         register_taxonomy( 'wptests_tax_2', 'post' );
@@ -687 +687 @@
         ) );
 
-        $this->assertWPError( $updated );
-        $this->assertSame( 'duplicate_term_slug', $updated->get_error_code() );
+        $this->assertFalse( is_wp_error( $updated ) );
+
+        $t1_term = get_term( $t1, 'wptests_tax' );
+        $t2_term = get_term( $t2, 'wptests_tax_2' );
+        $this->assertSame( $t1_term->slug, $t2_term->slug );
+    }
+
+    /**
+     * @ticket 30780
+     */
+    public function test_wp_update_term_should_allow_duplicate_names_in_different_taxonomies() {
+        register_taxonomy( 'wptests_tax', 'post' );
+        register_taxonomy( 'wptests_tax_2', 'post' );
+
+        $t1 = $this->factory->term->create( array(
+            'name' => 'Foo',
+            'slug' => 'foo',
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $t2 = $this->factory->term->create( array(
+            'name' => 'Bar',
+            'slug' => 'bar',
+            'taxonomy' => 'wptests_tax_2',
+        ) );
+
+        $updated = wp_update_term( $t2, 'wptests_tax_2', array(
+            'name' => 'Foo',
+        ) );
+
+        $this->assertFalse( is_wp_error( $updated ) );
+
+        $t2_term = get_term( $t2, 'wptests_tax_2' );
+        $this->assertSame( 'Foo', $t2_term->name );
+    }
+
+    /**
+     * @ticket 30780
+     */
+    public function test_wp_update_term_should_allow_duplicate_names_at_different_levels_of_the_same_taxonomy() {
+        register_taxonomy( 'wptests_tax', 'post', array(
+            'hierarchical' => true,
+        ) );
+
+        $t1 = $this->factory->term->create( array(
+            'name' => 'Foo',
+            'slug' => 'foo',
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $t2 = $this->factory->term->create( array(
+            'name' => 'Bar',
+            'slug' => 'bar',
+            'taxonomy' => 'wptests_tax',
+            'parent' => $t1,
+        ) );
+
+        $t3 = $this->factory->term->create( array(
+            'name' => 'Bar Child',
+            'slug' => 'bar-child',
+            'taxonomy' => 'wptests_tax',
+            'parent' => $t2,
+        ) );
+
+        $updated = wp_update_term( $t3, 'wptests_tax', array(
+            'name' => 'Bar',
+        ) );
+
+        $this->assertFalse( is_wp_error( $updated ) );
+
+        $t3_term = get_term( $t3, 'wptests_tax' );
+        $this->assertSame( 'Bar', $t3_term->name );
     }
 
@@ -1606 +1676 @@
     }
 
+    /**
+     * @ticket 30780
+     */
+    public function test_wp_update_term_should_assign_new_slug_when_reassigning_parent_as_long_as_there_is_no_other_term_with_the_same_slug() {
+        register_taxonomy( 'wptests_tax', 'post', array(
+            'hierarchical' => true,
+        ) );
+        register_taxonomy( 'wptests_tax_2', 'post', array(
+            'hierarchical' => true,
+        ) );
+
+        $t1 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax',
+            'slug' => 'parent-term',
+        ) );
+
+        $t2 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax',
+            'slug' => 'foo',
+        ) );
+
+        wp_update_term( $t2, 'wptests_tax', array(
+            'parent' => $t1,
+        ) );
+
+        $t2_term = get_term( $t2, 'wptests_tax' );
+
+        $this->assertSame( 'foo', $t2_term->slug );
+
+        _unregister_taxonomy( 'wptests_tax' );
+    }
+
+    /**
+     * @ticket 30780
+     */
+    public function test_wp_update_term_should_not_assign_new_slug_when_reassigning_parent_as_long_as_there_is_no_other_slug_conflict_within_the_taxonomy() {
+        register_taxonomy( 'wptests_tax', 'post', array(
+            'hierarchical' => true,
+        ) );
+        register_taxonomy( 'wptests_tax_2', 'post', array(
+            'hierarchical' => true,
+        ) );
+
+        $t1 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax',
+            'slug' => 'parent-term',
+        ) );
+
+        // Same slug but in a different tax.
+        $t2 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax_2',
+            'slug' => 'foo',
+        ) );
+
+        $t3 = $this->factory->term->create( array(
+            'taxonomy' => 'wptests_tax',
+            'slug' => 'foo',
+        ) );
+
+        wp_update_term( $t3, 'wptests_tax', array(
+            'parent' => $t1,
+        ) );
+
+        $t3_term = get_term( $t3, 'wptests_tax' );
+
+        $this->assertSame( 'foo', $t3_term->slug );
+
+        _unregister_taxonomy( 'wptests_tax' );
+    }
+
     /** Helpers **********************************************************/