Changeset 26010

Timestamp:

11/05/2013 01:18:02 AM (11 years ago)

Author:

wonderboymusic

Message:

Cast proper fields to int when returning from wp_get_object_terms(). Add term_taxonomy_id and object_id to the list in sanitize_term() and sanitize_term_field().

Fixes #17646. Adds unit tests.
Props simonwheatley, dd32, kovshenin.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -1659 +1659 @@
 function sanitize_term($term, $taxonomy, $context = 'display') {
 
-    if ( 'raw' == $context )
-        return $term;
-
-    $fields = array('term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group');
-
-    $do_object = false;
-    if ( is_object($term) )
-        $do_object = true;
+    $fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
+
+    $do_object = is_object( $term );
 
     $term_id = $do_object ? $term->term_id : (isset($term['term_id']) ? $term['term_id'] : 0);
@@ -1715 +1710 @@
  */
 function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
-    if ( 'parent' == $field  || 'term_id' == $field || 'count' == $field || 'term_group' == $field ) {
-        $value = (int) $value;
-        if ( $value < 0 )
-            $value = 0;
-    }
+    $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
+    if ( in_array( $field, $int_fields ) )
+        $value = absint( $value );
 
     if ( 'raw' == $context )
@@ -2050 +2043 @@
 
     if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
-        $terms = array_merge($terms, $wpdb->get_results($query));
-        update_term_cache($terms);
+        $_terms = $wpdb->get_results( $query );
+        foreach ( $_terms as &$term )
+            $term = sanitize_term( $term, $taxonomy, 'raw' );
+        $terms = array_merge( $terms, $_terms );
+        update_term_cache( $terms );
     } else if ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
-        $terms = array_merge($terms, $wpdb->get_col($query));
+        $_terms = $wpdb->get_col( $query );
+        $_field = ( 'ids' == $fields ) ? 'term_id' : 'name';
+        foreach ( $_terms as &$term )
+            $term = sanitize_term_field( $_field, $term, $term, $taxonomy, 'raw' );
+        $terms = array_merge( $terms, $_terms );
     } else if ( 'tt_ids' == $fields ) {
         $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
+        foreach ( $terms as &$tt_id )
+            $tt_id = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context.
     }
 

trunk/tests/phpunit/tests/term.php

@@ -434 +434 @@
     }
 
+    function test_get_object_terms_types() {
+        $post_id = $this->factory->post->create();
+        $term = wp_insert_term( 'one', $this->taxonomy );
+        wp_set_object_terms( $post_id, $term, $this->taxonomy );
+
+        $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'all_with_object_id' ) ) );
+        $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
+        foreach ( $int_fields as $field )
+            $this->assertInternalType( 'int', $term->$field, $field );
+
+        $term = array_shift( wp_get_object_terms( $post_id, $this->taxonomy, array( 'fields' => 'ids' ) ) );
+        $this->assertInternalType( 'int', $term, 'term' );
+    }
+
     private function assertPostHasTerms( $post_id, $expected_term_ids, $taxonomy ) {
         $assigned_term_ids = wp_get_object_terms( $post_id, $taxonomy, array(