WordPress 3.8.1

[autoinstalls/wordpress.git] / wp-admin / includes / misc.php

diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php
index 5adb20d606736a33f7d4c01292324520794894c8..3a8ad89e5ec735ce824dc25504cf679b6b7007ac 100644 (file)
--- a/wp-admin/includes/misc.php
+++ b/wp-admin/includes/misc.php
@@ -561,7 +561,7 @@ function saveDomDocument($doc, $filename) {
  *
  * @since 3.0.0
  */
  *
  * @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 );
        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 ) );
        }
 
                $_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';
 
        if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
                $current_color = 'fresh';