Changeset 30205

Timestamp:

11/03/2014 02:24:23 PM (12 years ago)

Author:

boonebgorges

Message:

In in_object_in_term(), only check numeric string values against term_id.

The previous in_array() check was playing too loose with mixed types, such
that a string like '10_term_name' would incorrectly match a term_id 10.

Props nobinobi, realloc.
Fixes #29467.

Location:

trunk

Files:

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

trunk/src/wp-includes/taxonomy.php

@@ -4263 +4263 @@
 
         foreach ( $object_terms as $object_term ) {
-                if ( $ints && in_array( $object_term->term_id, $ints ) ) return true; // If int, check against term_id
+                // If term is an int, check against term_ids only.
+                if ( $ints && in_array( $object_term->term_id, $ints ) ) {
+                        return true;
+                }
+
                 if ( $strs ) {
-                        if ( in_array( $object_term->term_id, $strs ) ) return true;
-                        if ( in_array( $object_term->name, $strs ) )    return true;
-                        if ( in_array( $object_term->slug, $strs ) )    return true;
+                        // Only check numeric strings against term_id, to avoid false matches due to type juggling.
+                        $numeric_strs = array_map( 'intval', array_filter( $strs, 'is_numeric' ) );
+                        if ( in_array( $object_term->term_id, $numeric_strs, true ) ) {
+                                return true;
+                        }
+
+                        if ( in_array( $object_term->name, $strs ) ) return true;
+                        if ( in_array( $object_term->slug, $strs ) ) return true;
                 }
         }

trunk/tests/phpunit/tests/term/isObjectInTerm.php

@@ -82 +82 @@
                 _unregister_taxonomy( 'wptests_tax', 'post' );
         }
+
+        /**
+         * @ticket 29467
+         */
+        public function test_should_not_return_true_if_term_name_begins_with_existing_term_id() {
+                register_taxonomy( 'wptests_tax', 'post' );
+                $t = $this->factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+
+                $post_ID  = $this->factory->post->create();
+                wp_set_object_terms( $post_ID, $t, 'wptests_tax' );
+
+                $int_tax_name = $t . '_term_name';
+
+                $this->assertFalse( is_object_in_term( $post_ID, 'wptests_tax', $int_tax_name ) );
+
+                // Verify it works properly when the post is actually in the term.
+                wp_set_object_terms( $post_ID, array( $int_tax_name ), 'wptests_tax' );
+                $this->assertTrue( is_object_in_term( $post_ID, 'wptests_tax', $int_tax_name ) );
+        }
 }