Changeset 26028

Timestamp:

11/06/2013 11:40:46 PM (12 years ago)

Author:

SergeyBiryukov

Message:

A negative term parent value should be sanitized to 0, not 1. Fix a regression in sanitize_term_field() caused by [26010].

props mattheu for initial patch.
fixes #25852.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1711 +1711 @@
 function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
     $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
-    if ( in_array( $field, $int_fields ) )
-        $value = absint( $value );
+    if ( in_array( $field, $int_fields ) ) {
+        $value = (int) $value;
+        if ( $value < 0 )
+            $value = 0;
+    }
 
     if ( 'raw' == $context )

trunk/tests/phpunit/tests/term.php

@@ -434 +434 @@
     }
 
+    /**
+     * @ticket 17646
+     */
     function test_get_object_terms_types() {
         $post_id = $this->factory->post->create();
@@ -446 +449 @@
         $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) ) );
         $this->assertInternalType( 'int', $term, 'term' );
+    }
+
+    /**
+     * @ticket 25852
+     */
+    function test_sanitize_term_field() {
+        $term = wp_insert_term( 'foo', $this->taxonomy );
+
+        $this->assertEquals( 0, sanitize_term_field( 'parent',  0, $term['term_id'], $this->taxonomy, 'raw' ) );
+        $this->assertEquals( 1, sanitize_term_field( 'parent',  1, $term['term_id'], $this->taxonomy, 'raw' ) );
+        $this->assertEquals( 0, sanitize_term_field( 'parent', -1, $term['term_id'], $this->taxonomy, 'raw' ) );
+        $this->assertEquals( 0, sanitize_term_field( 'parent', '', $term['term_id'], $this->taxonomy, 'raw' ) );
     }