From b03de9abe4dde6e7f1bdc0af7327620e5ad38f24 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 20 Sep 2005 17:55:16 +0000
Subject: [PATCH] Don't reset user cookies when editing other users.  Props
 donncha. fixes #1689

git-svn-id: http://svn.automattic.com/wordpress/trunk@2895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/registration-functions.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-includes/registration-functions.php b/wp-includes/registration-functions.php
index 269329bd9..b9815e39e 100644
--- a/wp-includes/registration-functions.php
+++ b/wp-includes/registration-functions.php
@@ -74,7 +74,7 @@ function wp_insert_user($userdata) {
 }
 
 function wp_update_user($userdata) {
-	global $wpdb;
+	global $wpdb, $current_user;
 
 	$ID = (int) $userdata['ID'];
 	
@@ -95,9 +95,11 @@ function wp_update_user($userdata) {
 	$user_id = wp_insert_user($userdata);
 
 	// Update the cookies if the password changed.	
-	if ( isset($plaintext_pass) ) {
-		wp_clearcookie();
-		wp_setcookie($userdata['user_login'], $plaintext_pass);
+	if( $current_user->id == $ID ) {
+		if ( isset($plaintext_pass) ) {
+			wp_clearcookie();
+			wp_setcookie($userdata['user_login'], $plaintext_pass);
+		}
 	}
 	
 	return $user_id;