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

Timestamp:

12/01/2013 11:59:13 PM (12 years ago)

Author:

wonderboymusic

Message:

Fix lingering reference problem in wp_get_object_terms() by not setting the foreach'd vars to a reference. Adds unit test.

Props stephenharris.
Fixes #26339.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -2047 +2047 @@
     if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
         $_terms = $wpdb->get_results( $query );
-        foreach ( $_terms as &$term )
-            $term = sanitize_term( $term, $taxonomy, 'raw' );
+        foreach ( $_terms as $key => $term ) {
+            $_terms[$key] = sanitize_term( $term, $taxonomy, 'raw' );
+        }
         $terms = array_merge( $terms, $_terms );
         update_term_cache( $terms );
@@ -2054 +2055 @@
         $_terms = $wpdb->get_col( $query );
         $_field = ( 'ids' == $fields ) ? 'term_id' : 'name';
-        foreach ( $_terms as &$term )
-            $term = sanitize_term_field( $_field, $term, $term, $taxonomy, 'raw' );
+        foreach ( $_terms as $key => $term ) {
+            $_terms[$key] = 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.
+        foreach ( $terms as $key => $tt_id ) {
+            $terms[$key] = 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.
+        }
     }