Ticket #46431: 46431.diff

src/wp-includes/taxonomy.php

@@ -2745 +2745 @@
         if ( apply_filters( 'wp_unique_term_slug_is_bad_slug', $needs_suffix, $slug, $term ) ) {
                 if ( $parent_suffix ) {
                         $slug .= $parent_suffix;
+                }
+
+                if ( ! empty( $term->term_id ) ) {
+                        $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
                 } else {
-                        if ( ! empty( $term->term_id ) ) {
-                                $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
-                        } else {
-                                $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
-                        }
+                        $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+                }
 
-                        if ( $wpdb->get_var( $query ) ) {
-                                $num = 2;
-                                do {
-                                        $alt_slug = $slug . "-$num";
-                                        $num++;
-                                        $slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug ) );
-                                } while ( $slug_check );
-                                $slug = $alt_slug;
-                        }
+                if ( $wpdb->get_var( $query ) ) {
+                        $num = 2;
+                        do {
+                                $alt_slug = $slug . "-$num";
+                                $num++;
+                                $slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug ) );
+                        } while ( $slug_check );
+                        $slug = $alt_slug;
                 }
         }
 

tests/phpunit/tests/term/wpUniqueTermSlug.php

@@ -127 +127 @@
                 $actual = wp_unique_term_slug( 'bar', $term2_object );
                 $this->assertEquals( 'bar-2', $actual );
         }
+
+        /**
+         * @group 46431
+         */
+        public function test_duplicate_parent_suffixed_slug_should_be_get_numeric_suffix() {
+                $t1 = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax2',
+                                'name'     => 'Animal',
+                                'slug'     => 'animal',
+                        )
+                );
+
+                $t2 = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax2',
+                                'name'     => 'Dog',
+                                'slug'     => 'dog',
+                        )
+                );
+
+                $t3 = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax2',
+                                'name'     => 'Cat',
+                                'slug'     => 'dog-animal',
+                                'parent'   => $t1,
+                        )
+                );
+
+                $t4 = self::factory()->term->create(
+                        array(
+                                'taxonomy' => 'wptests_tax2',
+                                'name'     => 'Giraffe',
+                                'slug'     => 'giraffe',
+                                'parent'   => $t1,
+                        )
+                );
+
+                $term = get_term( $t4 );
+
+                $slug = wp_unique_term_slug( 'dog', $term );
+
+                $this->assertSame( 'dog-animal-2', $slug );
+        }
 }