WP Merge to revision 6287

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1130 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 22 insertions, 16 deletions

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index 5c60ad4..fb40b2e 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -1431,15 +1431,7 @@ function clean_term_cache($ids, $taxonomy = '') {
  * @return bool|array Empty array if $terms found, but not $taxonomy. False if nothing is in cache for $taxonomy and $id.
  */
 function &get_object_term_cache($id, $taxonomy) {
-	$terms = wp_cache_get($id, 'object_terms');
-	if ( false !== $terms ) {
-		if ( isset($terms[$taxonomy]) )
-			return $terms[$taxonomy];
-		else
-			return array();
-	}
-
-	return false;
+	return wp_cache_get($id, "{$taxonomy}_relationships");
 }
 
 /**
@@ -1467,28 +1459,42 @@ function update_object_term_cache($object_ids, $object_type) {
 
 	$object_ids = array_map('intval', $object_ids);
 
+	$taxonomies = get_object_taxonomies($object_type);
+
 	$ids = array();
 	foreach ( (array) $object_ids as $id ) {
-		if ( false === wp_cache_get($id, 'object_terms') )
-			$ids[] = $id;
+		foreach ( $taxonomies as $taxonomy ) {
+			if ( false === wp_cache_get($id, "{$taxonomy}_relationships") ) {
+				$ids[] = $id;
+				break;
+			}
+		}
 	}
 
 	if ( empty( $ids ) )
 		return false;
 
-	$terms = wp_get_object_terms($ids, get_object_taxonomies($object_type), 'fields=all_with_object_id');
+	$terms = wp_get_object_terms($ids, $taxonomies, 'fields=all_with_object_id');
 
 	$object_terms = array();
 	foreach ( (array) $terms as $term )
 		$object_terms[$term->object_id][$term->taxonomy][$term->term_id] = $term;
 
 	foreach ( $ids as $id ) {
-		if ( ! isset($object_terms[$id]) )
-				$object_terms[$id] = array();
+		foreach ( $taxonomies  as $taxonomy ) {
+			if ( ! isset($object_terms[$id][$taxonomy]) ) {
+				if ( !isset($object_terms[$id]) )
+					$object_terms[$id] = array();
+				$object_terms[$id][$taxonomy] = array();
+			}
+		}
 	}
 
-	foreach ( $object_terms as $id => $value )
-		wp_cache_set($id, $value, 'object_terms');
+	foreach ( $object_terms as $id => $value ) {
+		foreach ( $value as $taxonomy => $terms ) {
+			wp_cache_set($id, $terms, "{$taxonomy}_relationships");
+		}
+	}
 }
 
 /**