From 7fc9941d2a9e5120e7fefc08be2f5b85c3ebea5d Mon Sep 17 00:00:00 2001
From: Helen Hou-Sandi <helen@git.wordpress.org>
Date: Wed, 8 Jan 2014 21:48:32 +0000
Subject: [PATCH] Pass the $user_id to the `admin_color_scheme_picker` hook for
 context. props nacin. see #26607 for trunk.

git-svn-id: https://develop.svn.wordpress.org/trunk@26924 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/misc.php | 4 ++--
 src/wp-admin/user-edit.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
index 86a679d794..be8e2b218e 100644
--- a/src/wp-admin/includes/misc.php
+++ b/src/wp-admin/includes/misc.php
@@ -561,7 +561,7 @@ function saveDomDocument($doc, $filename) {
  *
  * @since 3.0.0
  */
-function admin_color_scheme_picker() {
+function admin_color_scheme_picker( $user_id ) {
 	global $_wp_admin_css_colors;
 
 	ksort( $_wp_admin_css_colors );
@@ -571,7 +571,7 @@ function admin_color_scheme_picker() {
 		$_wp_admin_css_colors = array_filter( array_merge( array( 'fresh' => '', 'light' => '' ), $_wp_admin_css_colors ) );
 	}
 
-	$current_color = get_user_option( 'admin_color' );
+	$current_color = get_user_option( 'admin_color', $user_id );
 
 	if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
 		$current_color = 'fresh';
diff --git a/src/wp-admin/user-edit.php b/src/wp-admin/user-edit.php
index 90c8811a5f..528d56b61a 100644
--- a/src/wp-admin/user-edit.php
+++ b/src/wp-admin/user-edit.php
@@ -260,7 +260,7 @@ if ( ! IS_PROFILE_PAGE ) {
  * @since 3.0.0
  */
 ?>
-<td><?php do_action( 'admin_color_scheme_picker' ); ?></td>
+<td><?php do_action( 'admin_color_scheme_picker', $user_id ); ?></td>
 </tr>
 <?php
 endif; // $_wp_admin_css_colors