Ticket #37009: 37009.diff

src/wp-includes/taxonomy.php

@@ -2485 +2485 @@
                 if ( !strlen(trim($term)) )
                         continue;
 
-                if ( !$term_info = term_exists($term, $taxonomy) ) {
-                        // Skip if a non-existent term ID is passed.
-                        if ( is_int($term) )
+                if ( is_int( $term ) ) {
+                        if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
                                 continue;
-                        $term_info = wp_insert_term($term, $taxonomy);
+                        }
+                } else {
+                        // Give preference to slug.
+                        $found_term = get_term_by( 'slug', $term, $taxonomy );
+                        print_r( $found_term );
+                        if ( ! $found_term ) {
+                                $found_term = get_term_by( 'name', $term, $taxonomy );
+                        }
+
+                        if ( $found_term ) {
+                                // For legacy purposes, these values should be numeric strings.
+                                $term_info = array(
+                                        'term_id' => (string) $found_term->term_id,
+                                        'term_taxonomy_id' => (string) $found_term->term_taxonomy_id,
+                                );
+                        } else {
+                                $term_info = wp_insert_term( $term, $taxonomy );
+                        }
                 }
+
                 if ( is_wp_error($term_info) )
                         return $term_info;
                 $term_ids[] = $term_info['term_id'];

tests/phpunit/tests/term/wpSetObjectTerms.php

@@ -318 +318 @@
                 $tt_ids = wp_set_object_terms( self::$post_ids[0], 'foo', 'wptests_tax' );
 
                 $this->assertNotEmpty( $tt_ids );
-                $term = get_term( $tt_ids[0] );
+                $term = get_term_by( 'term_taxonomy_id', $tt_ids[0] );
                 $this->assertInstanceOf( 'WP_Term', $term );
                 $this->assertSame( 'foo', $term->slug );
         }
@@ -335 +335 @@
                 $tt_ids = wp_set_object_terms( self::$post_ids[0], 'foo', 'wptests_tax' );
 
                 $this->assertNotEmpty( $tt_ids );
-                $term = get_term( $tt_ids[0] );
+                $term = get_term_by( 'term_taxonomy_id', $tt_ids[0] );
                 $this->assertInstanceOf( 'WP_Term', $term );
                 $this->assertSame( $t, $term->term_id );
         }
@@ -352 +352 @@
                 $tt_ids = wp_set_object_terms( self::$post_ids[0], 'Bar', 'wptests_tax' );
 
                 $this->assertNotEmpty( $tt_ids );
-                $term = get_term( $tt_ids[0] );
+                $term = get_term_by( 'term_taxonomy_id', $tt_ids[0] );
                 $this->assertInstanceOf( 'WP_Term', $term );
                 $this->assertSame( $t, $term->term_id );
         }
@@ -375 +375 @@
                 $tt_ids = wp_set_object_terms( self::$post_ids[0], 'Bar', 'wptests_tax' );
 
                 $this->assertNotEmpty( $tt_ids );
-                $term = get_term( $tt_ids[0] );
+                $term = get_term_by( 'term_taxonomy_id', $tt_ids[0] );
                 $this->assertInstanceOf( 'WP_Term', $term );
                 $this->assertSame( $t2, $term->term_id );
         }
@@ -387 +387 @@
 
                 $this->assertSame( array(), $tt_ids );
         }
+
+        /**
+         * @ticket 37009
+         * @group bbg
+         */
+        public function test_slug_of_newly_created_term_should_be_suffixed_when_matching_slug_of_existing_term() {
+                register_taxonomy( 'wptests_tax', 'post' );
+
+                $t = self::factory()->term->create( array(
+                        'taxonomy' => 'wptests_tax',
+                        'name' => '$foo',
+                        'slug' => 'foo',
+                ) );
+
+                $tt_ids = wp_set_object_terms( self::$post_ids[0], array( '$foo', '#foo' ), 'wptests_tax' );
+
+                print_r( $tt_ids );
+        }
 }