WP Merge

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

1 files changed, 13 insertions, 6 deletions

diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index d53a165..18e8dc0 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -2145,13 +2145,17 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
 		$wpdb->query("INSERT INTO $wpdb->usermeta ( user_id, meta_key, meta_value )
 		VALUES
 		( '$user_id', '$meta_key', '$meta_value' )");
-		return true;
-	}
-	if ( $cur->meta_value != $meta_value )
+	} else if ( $cur->meta_value != $meta_value ) {
 		$wpdb->query("UPDATE $wpdb->usermeta SET meta_value = '$meta_value' WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
-
+	} else {
+		return false;	
+	}
+	
+	$user = get_userdata($user_id);
 	wp_cache_delete($user_id, 'users');
-	// FIXME: Need to delete username keyed cache object.
+	wp_cache_delete($user->user_login, 'users');
+	
+	return true;
 }
 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
@@ -2169,8 +2173,11 @@ function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	else
 		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
 		
+	$user = get_userdata($user_id);
 	wp_cache_delete($user_id, 'users');
-	// FIXME: Need to delete username keyed cache object.
+	wp_cache_delete($user->user_login, 'users');
+	
+	return true;
 }
 
 function register_activation_hook($file, $function) {