Changeset 34999 for trunk/src/wp-includes/taxonomy-functions.php

Timestamp:

10/10/2015 03:38:41 AM (11 years ago)

Author:

boonebgorges

Message:

Return WP_Post objects from wp_get_object_terms().

A side effect of this change is that terms stored in the cache no longer have
an object_id associated with them. Previously, object_id had always been
cached when the term cache was populated via wp_get_object_terms(), a
strategy that was mostly harmless but still incorrect.

See #14162.

File:

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

trunk/src/wp-includes/taxonomy-functions.php

@@ -2195 +2195 @@
  * @since 4.2.0 Added support for 'taxonomy', 'parent', and 'term_taxonomy_id' values of `$orderby`.
  *              Introduced `$parent` argument.
- * @since 4.4.0 Introduced `$meta_query` and `$update_term_meta_cache` arguments.
+ * @since 4.4.0 Introduced `$meta_query` and `$update_term_meta_cache` arguments. When `$fields` is 'all' or
+ *              'all_with_object_id', an array of `WP_Term` objects will be returned.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
@@ -2337 +2338 @@
         if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
                 $_terms = $wpdb->get_results( $query );
+                $object_id_index = array();
                 foreach ( $_terms as $key => $term ) {
-                        $_terms[$key] = sanitize_term( $term, $taxonomy, 'raw' );
-                }
+                        $term = sanitize_term( $term, $taxonomy, 'raw' );
+                        $_terms[ $key ] = $term;
+
+                        if ( isset( $term->object_id ) ) {
+                                $object_id_index[ $key ] = $term->object_id;
+                        }
+                }
+
+                update_term_cache( $_terms );
+                $_terms = array_map( 'get_term', $_terms );
+
+                // Re-add the object_id data, which is lost when fetching terms from cache.
+                if ( 'all_with_object_id' === $fields ) {
+                        foreach ( $_terms as $key => $_term ) {
+                                if ( isset( $object_id_index[ $key ] ) ) {
+                                        $_term->object_id = $object_id_index[ $key ];
+                                }
+                        }
+                }
+
                 $terms = array_merge( $terms, $_terms );
-                update_term_cache( $terms );
                 $objects = true;
+
         } elseif ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
                 $_terms = $wpdb->get_col( $query );
@@ -3556 +3576 @@
 function update_term_cache( $terms, $taxonomy = '' ) {
         foreach ( (array) $terms as $term ) {
-                $term_taxonomy = $taxonomy;
-                if ( empty($term_taxonomy) )
-                        $term_taxonomy = $term->taxonomy;
-
-                wp_cache_add( $term->term_id, $term, 'terms' );
+                // Create a copy in case the array was passed by reference.
+                $_term = $term;
+
+                // Object ID should not be cached.
+                unset( $_term->object_id );
+
+                wp_cache_add( $term->term_id, $_term, 'terms' );
         }
 }