Changeset 26793

Timestamp:

12/08/2013 07:05:01 AM (11 years ago)

Author:

nacin

Message:

Nonces are already per-user. see #22862.

Location:

trunk/src/wp-admin/includes

Files:

• ajax-actions.php (modified) (2 diffs)
• misc.php (modified) (3 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -2250 +2250 @@
     global $_wp_admin_css_colors;
 
-    $user_id = get_current_user_id();
-
-    check_ajax_referer( 'save-color-scheme_' . $user_id, 'nonce' );
+    check_ajax_referer( 'save-color-scheme', 'nonce' );
 
     $color_scheme = sanitize_key( $_POST['color_scheme'] );
@@ -2260 +2258 @@
     }
 
-    update_user_meta( $user_id, 'admin_color', $color_scheme );
+    update_user_meta( get_current_user_id(), 'admin_color', $color_scheme );
     wp_send_json_success();
 }

trunk/src/wp-admin/includes/misc.php

@@ -563 +563 @@
  */
 function admin_color_scheme_picker() {
-    global $_wp_admin_css_colors, $user_id;
+    global $_wp_admin_css_colors;
 
     ksort( $_wp_admin_css_colors );
@@ -572 +572 @@
     }
 
-    $current_color = get_user_option( 'admin_color', $user_id );
+    $current_color = get_user_option( 'admin_color' );
 
     if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
@@ -582 +582 @@
         <legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
         <?php
-        wp_nonce_field( 'save-color-scheme_' . $user_id, 'color-nonce', false );
+        wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
         foreach ( $_wp_admin_css_colors as $color => $color_info ) :