Changeset 26937 for branches/3.8/src/wp-admin/includes/misc.php

Timestamp:

01/13/2014 04:27:40 PM (11 years ago)

Author:

nacin

Message:

Pass the $user_id to the admin_color_scheme_picker hook for context.

Prevents the admin color scheme from changing when editing another user.

Merges [26924] to the 3.8 branch.
see #26607.

Location:

branches/3.8

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/misc.php (modified) (2 diffs)

branches/3.8/src/wp-admin/includes/misc.php

@@ -562 +562 @@
  * @since 3.0.0
  */
-function admin_color_scheme_picker() {
+function admin_color_scheme_picker( $user_id ) {
     global $_wp_admin_css_colors;
 
@@ -572 +572 @@
     }
 
-    $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 ] ) ) {