Ticket #31328: 31328.6.diff

src/wp-includes/taxonomy.php

@@ -2903 +2903 @@
                 }
         }
 
-        // Terms with duplicate names are not allowed at the same level of a taxonomy hierarchy.
+        /*
+         * Prevent the creation of terms with duplicate names at the same level of a taxonomy hierarchy,
+         * unless a unique slug has been explicitly provided.
+         */
         if ( $existing_term = get_term_by( 'name', $name, $taxonomy ) ) {
-                if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-                        $siblings = get_terms( $taxonomy, array( 'fields' => 'names', 'get' => 'all', 'parent' => $parent ) );
-                        if ( in_array( $name, $siblings ) ) {
-                                return new WP_Error( 'term_exists', __( 'A term with the name already exists with this parent.' ), $existing_term->term_id );
+                if ( ! $slug_provided || $existing_term->slug === $slug ) {
+                        if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+                                $siblings = get_terms( $taxonomy, array( 'fields' => 'names', 'get' => 'all', 'parent' => $parent ) );
+                                if ( in_array( $name, $siblings ) ) {
+                                        return new WP_Error( 'term_exists', __( 'A term with the name already exists with this parent.' ), $existing_term->term_id );
+                                }
+                        } else {
+                                return new WP_Error( 'term_exists', __( 'A term with the name already exists in this taxonomy.' ), $existing_term->term_id );
                         }
-                } else {
-                        return new WP_Error( 'term_exists', __( 'A term with the name already exists in this taxonomy.' ), $existing_term->term_id );
                 }
         }
 

tests/phpunit/tests/term.php

@@ -174 +174 @@
 
                 // Test existing term name with unique slug
                 $term1 = $this->factory->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
-                $this->assertTrue( is_wp_error( $term1 ) );
-                $this->assertSame( 'term_exists', $term1->get_error_code() );
-                $this->assertEquals( $term->term_id, $term1->get_error_data() );
+                $this->assertFalse( is_wp_error( $term1 ) );
 
                 // Test an existing term name
                 $term2 = $this->factory->tag->create( array( 'name' => 'Bozo' ) );
@@ -228 +226 @@
         }
 
         /**
+         * @ticket 31328
+         */
+        public function test_wp_insert_term_should_allow_duplicate_names_when_a_matching_slug_has_been_provided_in_non_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post' );
+                $t1 = $this->factory->term->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $t2 = wp_insert_term( 'Foo', 'wptests_tax', array(
+                        'slug' => 'foo',
+                ) );
+
+                $this->assertWPError( $t2 );
+                $this->assertSame( 'term_exists', $t2->get_error_code() );
+        }
+
+        /**
+         * @ticket 31328
+         */
+        public function test_wp_insert_term_should_allow_duplicate_names_when_a_unique_slug_has_been_provided_in_non_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post' );
+                $t1 = $this->factory->term->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $t2 = wp_insert_term( 'Foo', 'wptests_tax', array(
+                        'slug' => 'foo-unique',
+                ) );
+
+                $this->assertFalse( is_wp_error( $t2 ) );
+
+                $t2_term = get_term( $t2['term_id'], 'wptests_tax' );
+                $this->assertSame( 'foo-unique', $t2_term->slug );
+                $this->assertSame( 'Foo', $t2_term->name );
+        }
+
+        /**
+         * @ticket 31328
+         */
+        public function test_wp_insert_term_should_not_allow_duplicate_names_when_the_slug_is_not_provided_in_non_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post' );
+                $t1 = $this->factory->term->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $t2 = wp_insert_term( 'Foo', 'wptests_tax' );
+
+                $this->assertWPError( $t2 );
+                $this->assertSame( 'term_exists', $t2->get_error_code() );
+        }
+
+        /**
+         * @ticket 31328
+         */
+        public function test_wp_insert_term_should_allow_duplicate_names_when_a_matching_slug_has_been_provided_in_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $t1 = $this->factory->term->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $t2 = wp_insert_term( 'Foo', 'wptests_tax', array(
+                        'slug' => 'foo',
+                ) );
+
+                $this->assertWPError( $t2 );
+                $this->assertSame( 'term_exists', $t2->get_error_code() );
+        }
+
+        /**
+         * @ticket 31328
+         */
+        public function test_wp_insert_term_should_allow_duplicate_names_when_a_unique_slug_has_been_provided_in_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $t1 = $this->factory->term->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $t2 = wp_insert_term( 'Foo', 'wptests_tax', array(
+                        'slug' => 'foo-unique',
+                ) );
+
+                $this->assertFalse( is_wp_error( $t2 ) );
+
+                $t2_term = get_term( $t2['term_id'], 'wptests_tax' );
+                $this->assertSame( 'foo-unique', $t2_term->slug );
+                $this->assertSame( 'Foo', $t2_term->name );
+        }
+
+        /**
+         * @ticket 31328
+         */
+        public function test_wp_insert_term_should_not_allow_duplicate_names_when_the_slug_is_not_provided_in_hierarchical_taxonomy() {
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $t1 = $this->factory->term->create( array(
+                        'name' => 'Foo',
+                        'slug' => 'foo',
+                        'taxonomy' => 'wptests_tax',
+                ) );
+
+                $t2 = wp_insert_term( 'Foo', 'wptests_tax' );
+
+                $this->assertWPError( $t2 );
+                $this->assertSame( 'term_exists', $t2->get_error_code() );
+        }
+        /**
          * @ticket 5809
          */
         public function test_wp_insert_term_duplicate_slug_same_taxonomy() {
@@ -370 +483 @@
                 $this->assertSame( 0, $created_term->term_group );
         }
 
-        public function test_wp_insert_term_duplicate_name_slug_non_hierarchical() {
-                register_taxonomy( 'foo', 'post', array() );
-
-                $existing_term = $this->factory->term->create( array(
-                        'slug' => 'new-term',
-                        'name' => 'New Term',
-                        'taxonomy' => 'foo',
-                ) );
-
-                $found = wp_insert_term( 'New Term', 'foo', array(
-                        'slug' => 'new-term',
-                ) );
-
-                _unregister_taxonomy( 'foo' );
-
-                $this->assertTrue( is_wp_error( $found ) );
-                $this->assertEquals( $existing_term, $found->get_error_data() );
-        }
-
-        public function test_wp_insert_term_duplicate_name_hierarchical() {
-                register_taxonomy( 'foo', 'post', array(
-                        'hierarchical' => true,
-                ) );
-
-                $parent_term = $this->factory->term->create( array(
-                        'taxonomy' => 'foo',
-                ) );
-
-                $existing_term = $this->factory->term->create( array(
-                        'name' => 'New Term',
-                        'taxonomy' => 'foo',
-                        'parent' => $parent_term,
-                ) );
-
-                $found = wp_insert_term( 'New Term', 'foo', array(
-                        'parent' => $parent_term,
-                ) );
-
-                _unregister_taxonomy( 'foo' );
-
-                $this->assertTrue( is_wp_error( $found ) );
-                $this->assertEquals( $existing_term, $found->get_error_data() );
-        }
-
-        public function test_wp_insert_term_duplicate_name_slug_hierarchical() {
-                register_taxonomy( 'foo', 'post', array(
-                        'hierarchical' => true,
-                ) );
-
-                $parent_term = $this->factory->term->create( array(
-                        'taxonomy' => 'foo',
-                ) );
-
-                $existing_term = $this->factory->term->create( array(
-                        'name' => 'New Term',
-                        'slug' => 'new-term-slug',
-                        'taxonomy' => 'foo',
-                        'parent' => $parent_term,
-                ) );
-
-                $found = wp_insert_term( 'New Term', 'foo', array(
-                        'parent' => $parent_term,
-                        'slug' => 'new-term-slug',
-                ) );
-
-                _unregister_taxonomy( 'foo' );
-
-                $this->assertTrue( is_wp_error( $found ) );
-                $this->assertEquals( $existing_term, $found->get_error_data() );
-        }
-
         /**
          * @ticket 5809
          */