Changeset 36214

Timestamp:

01/07/2016 03:31:48 AM (8 years ago)

Author:

boonebgorges

Message:

Ensure 'description' is a string in wp_insert_term().

Passing 'description' => null when creating a term can cause MySQL notices,
as the description column in the terms table does not allow for null values.
We correct this by intepreting a null description as an empty string.

Props TimothyBlynJacobs.
Fixes #35321.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -2580 +2580 @@
         return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
     }
+
     $args['name'] = $term;
     $args['taxonomy'] = $taxonomy;
+
+    // Coerce null description to strings, to avoid database errors.
+    $args['description'] = (string) $args['description'];
+
     $args = sanitize_term($args, $taxonomy, 'db');
 

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

@@ -643 +643 @@
     }
 
+    /**
+     * @ticket 35321
+     */
+    public function test_wp_insert_term_with_null_description() {
+
+        register_taxonomy( 'wptests_tax', 'post' );
+
+        $term = wp_insert_term( 'foo', 'wptests_tax', array(
+            'description' => null
+        ) );
+
+        $term_object = get_term( $term['term_id'] );
+
+        $this->assertInstanceOf( 'WP_Term', $term_object );
+        $this->assertSame( '', $term_object->description );
+    }
+
     /** Helpers **********************************************************/