From 42da7f30534f13cf80aff28dbbbbf7105bc6f46d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 26 Nov 2013 13:57:58 +0000 Subject: [PATCH] Rename mp6_color_scheme JS global to wp_color_scheme. props kovshenin. see #26263. git-svn-id: https://develop.svn.wordpress.org/trunk@26406 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/misc.php | 2 +- src/wp-includes/js/svg-painter.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php index c3520dd999..2a8eba2d63 100644 --- a/src/wp-admin/includes/misc.php +++ b/src/wp-admin/includes/misc.php @@ -621,7 +621,7 @@ function set_color_scheme_json() { $color_scheme = get_user_option( 'admin_color' ); if ( isset( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) { - echo '\n"; + echo '\n"; } } add_action( 'admin_head', 'set_color_scheme_json' ); diff --git a/src/wp-includes/js/svg-painter.js b/src/wp-includes/js/svg-painter.js index 36b6fe1a2c..c1ec8721ce 100644 --- a/src/wp-includes/js/svg-painter.js +++ b/src/wp-includes/js/svg-painter.js @@ -1,4 +1,4 @@ -/* global mp6_color_scheme:true */ +/* global wp_color_scheme:true */ var svgPainter = ( function( $, window, document, undefined ) { 'use strict'; @@ -30,8 +30,8 @@ var svgPainter = ( function( $, window, document, undefined ) { setColors : function( colors ) { - if ( typeof colors === 'undefined' && typeof mp6_color_scheme !== 'undefined' ) { - colors = mp6_color_scheme; + if ( typeof colors === 'undefined' && typeof wp_color_scheme !== 'undefined' ) { + colors = wp_color_scheme; } this.colorscheme = colors;