Changeset 34809

Timestamp:

10/03/2015 08:24:09 PM (9 years ago)

Author:

boonebgorges

Message:

When creating terms, avoid false dupe checks due to accented characters.

wp_insert_term() doesn't allow the creation of a term when the term name
is the same as another term in the same hierarchy level of the same taxonomy.
Previously, this duplicate check used get_term_by( 'name' ), which uses the
database collation to determine sameness. But common collations do not
distinguish between accented and non-accented versions of a character. As a
result, it was impossible to create a term 'Foo' if a sibling term with an
accented character existed.

We address this problem by using get_terms() to do the duplicate check. This
query returns all potentially matching terms. We then do a stricter check
for equivalence in PHP, before determining whether one of the matches is
indeed a duplicate.

Props boonebgorges, tyxla, geza.miklo, mehulkaklotar.
Fixes #33864.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy-functions.php

@@ -2517 +2517 @@
      * unless a unique slug has been explicitly provided.
      */
-    if ( $name_match = get_term_by( 'name', $name, $taxonomy ) ) {
+    $name_matches = get_terms( $taxonomy, array(
+        'name' => $name,
+        'hide_empty' => false,
+    ) );
+
+    /*
+     * The `name` match in `get_terms()` doesn't differentiate accented characters,
+     * so we do a stricter comparison here.
+     */
+    $name_match = null;
+    if ( $name_matches ) {
+        foreach ( $name_matches as $_match ) {
+            if ( strtolower( $name ) === strtolower( $_match->name ) ) {
+                $name_match = $_match;
+                break;
+            }
+        }
+    }
+
+    if ( $name_match ) {
         $slug_match = get_term_by( 'slug', $slug, $taxonomy );
         if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {

trunk/tests/phpunit/tests/term/wpInsertTerm.php

@@ -629 +629 @@
     }
 
+    /**
+     * @ticket 33864
+     */
+    public function test_wp_insert_term_with_and_without_accents() {
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $t1 = $this->factory->term->create( array(
+            'name' => 'Foó',
+            'taxonomy' => 'wptests_tax',
+        ) );
+        $t2 = $this->factory->term->create( array(
+            'name' => 'Foo',
+            'taxonomy' => 'wptests_tax',
+        ) );
+
+        $this->assertInternalType( 'int', $t1 );
+        $this->assertInternalType( 'int', $t2 );
+        $this->assertNotEquals( $t1, $t2 );
+
+        $term_2 = get_term( $t2, 'wptests_tax' );
+        $this->assertSame( $t2, $term_2->term_id );
+        $this->assertSame( 'Foo', $term_2->name );
+
+    }
+
     /** Helpers **********************************************************/