WP Merge to rev 6290

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

1 files changed, 3 insertions, 2 deletions

diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php
index fb40b2e..7fdf962 100644
--- a/wp-includes/taxonomy.php
+++ b/wp-includes/taxonomy.php
@@ -903,7 +903,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) {
 			return $term_obj;
 		$parent = $term_obj->parent;
 
-		$wpdb->update( $wpdb->term_taxonomy, compact( $parent ), array( 'parent' => $term_obj->term_id) + compact( $taxonomy ) );
+		$wpdb->update( $wpdb->term_taxonomy, compact( 'parent' ), array( 'parent' => $term_obj->term_id) + compact( 'taxonomy' ) );
 	}
 
 	$objects = $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
@@ -1365,7 +1365,8 @@ function clean_object_term_cache($object_ids, $object_type) {
 		$object_ids = array($object_ids);
 
 	foreach ( $object_ids as $id )
-		wp_cache_delete($id, 'object_terms');
+		foreach ( get_object_taxonomies($object_type) as $taxonomy )
+			wp_cache_delete($id, "{$taxonomy}_relationships");
 
 	do_action('clean_object_term_cache', $object_ids, $object_type);
 }