From 310940b824eff4a116dcd72ccd339bb602021981 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 10 Jun 2008 14:08:54 +0000
Subject: Merge with branches/2.5 in WordPress, revision 8066

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/user-edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wp-admin/user-edit.php')

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 8ee9c05..b01c3a8 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -171,7 +171,7 @@ include ('admin-header.php');
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td>
 <?php
-$current_color = get_user_option('admin_color');
+$current_color = get_user_option('admin_color', $user_id);
 if ( empty($current_color) )
 	$current_color = 'fresh';
 foreach ( $_wp_admin_css_colors as $color => $color_info ): ?>
-- 
cgit