Changeset 29865

Timestamp:

10/09/2014 03:15:50 AM (10 years ago)

Author:

boonebgorges

Message:

Don't bail out of term_exists() when term sanitizes to an empty string.

This change brings return values for failures of this sort in line with other
failed lookups in term_exists(): a null value is now returned in all cases
where the queried term is not found.

Adds unit test for the sanitization issue. Modifies existing unit test to
reflect the change in return value for empty term strings.

Props boonebgorges, georgestephanis.
Fixes #29589.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1657 +1657 @@
  * @param string $taxonomy The taxonomy name to use
  * @param int $parent Optional. ID of parent term under which to confine the exists search.
- * @return mixed Returns 0 if the term does not exist. Returns the term ID if no taxonomy is specified
- *               and the term ID exists. Returns an array of the term ID and the term taxonomy ID
- *               if the taxonomy is specified and the pairing exists.
+ * @return mixed Returns null if the term does not exist. Returns the term ID
+ *               if no taxonomy is specified and the term ID exists. Returns
+ *               an array of the term ID and the term taxonomy ID the taxonomy
+ *               is specified and the pairing exists.
  */
 function term_exists( $term, $taxonomy = '', $parent = null ) {
@@ -1678 +1679 @@
 
     $term = trim( wp_unslash( $term ) );
-
-    if ( '' === $slug = sanitize_title($term) )
-        return 0;
+    $slug = sanitize_title( $term );
 
     $where = 't.slug = %s';

trunk/tests/phpunit/tests/term.php

@@ -113 +113 @@
 
     public function test_term_exists_term_trimmed_to_empty_string() {
-        $this->assertSame( 0, term_exists( '   ' ) );
+        $this->assertNull( term_exists( '   ' ) );
+    }
+
+    /**
+     * @ticket 29589
+     */
+    public function test_term_exists_existing_term_that_sanitizes_to_empty() {
+        wp_insert_term( '//', 'category' );
+        $this->assertNotEmpty( term_exists( '//' ) );
+        $this->assertNotEmpty( term_exists( '//', 'category' ) );
+
+        wp_insert_term( '>>', 'category' );
+        $this->assertNotEmpty( term_exists( '>>' ) );
+        $this->assertNotEmpty( term_exists( '>>', 'category' ) );
     }