Changeset 30205 for trunk/src/wp-includes/taxonomy.php

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.

File:

• trunk/src/wp-includes/taxonomy.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;
                 }
         }