Changeset 45893

Timestamp:

08/26/2019 03:18:40 PM (5 years ago)

Author:

boonebgorges

Message:

Taxonomy: Fix unique-slug check for terms with parents.

wp_unique_term_slug() appends numeric suffixes when the requested slug is
already in use by a sibling term. Changes introduced in [32837] inadvertently
caused this suffixing to be skipped in cases where the requested slug is
suffixed with the parent slug, so that it became possible to have two terms
childslug-parentslug underneath to the same parentslug. We fix this
regression by ensuring that the numeric-suffix routine runs in all cases.

Props yashar_hv, saskak, dlh.
Fixes #46431.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -2746 +2746 @@
         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 );
-            }
-
-            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;
-            }
+            $query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+        }
+
+        if ( $wpdb->get_var( $query ) ) { // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
+            $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;
         }
     }

trunk/tests/phpunit/tests/term/wpUniqueTermSlug.php

@@ -128 +128 @@
         $this->assertEquals( 'bar-2', $actual );
     }
+
+    /**
+     * @ticket 46431
+     */
+    public function test_duplicate_parent_suffixed_slug_should_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 );
+    }
 }