From aa1ac65bfcd669c4d6cf8a7c33d08cdf670bfd8d Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Sat, 7 Dec 2013 09:05:10 +0000
Subject: [PATCH] Admin color schemes: Manually handle RTL and minified
 versions of the CSS files on registration.

This bypasses WP_Styles entirely, which is much simpler for the moment, given that color schemes bypass WP_Styles for plenty already. The script loader is told to stop thinking of colors.css as an RTL-ified file. The colors-fresh handle, used directly on the login screen, needed to be (even before this commit).

fixes #26316.

Built from https://develop.svn.wordpress.org/trunk@26780


git-svn-id: http://core.svn.wordpress.org/trunk@26667 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 23 +++++++++++++----------
 wp-includes/script-loader.php    |  5 +----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 4dac0f7819..3a60ffb381 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -2115,8 +2115,11 @@ function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = arra
  * @since 3.0.0
  */
 function register_admin_color_schemes() {
+	$suffix = is_rtl() ? '-rtl' : '';
+	$suffix .= SCRIPT_DEBUG ? '' : '.min';
+
 	wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
-		admin_url( 'css/colors.min.css' ),
+		admin_url( "css/colors$suffix.css" ),
 		array( '#222', '#333', '#0074a2', '#2ea2cc' ),
 		array( 'base' => '#999', 'focus' => '#2ea2cc', 'current' => '#fff' )
 	);
@@ -2126,43 +2129,43 @@ function register_admin_color_schemes() {
 		return;
 
 	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
-		admin_url( 'css/colors/light/colors.min.css' ),
+		admin_url( "css/colors/light/colors$suffix.css" ),
 		array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
 		array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
 	);
 
 	wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
-		admin_url( 'css/colors/blue/colors.min.css' ),
+		admin_url( "css/colors/blue/colors$suffix.css" ),
 		array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
 		array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
 	);
 
 	wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
-		admin_url( 'css/colors/midnight/colors.min.css' ),
+		admin_url( "css/colors/midnight/colors$suffix.css" ),
 		array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
 		array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
 	);
 
 	wp_admin_css_color( 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
-		admin_url( 'css/colors/sunrise/colors.min.css' ),
-		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ), 
+		admin_url( "css/colors/sunrise/colors$suffix.css" ),
+		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
 		array( 'base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff' )
 	);
 
 	wp_admin_css_color( 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
-		admin_url( 'css/colors/ectoplasm/colors.min.css' ),
+		admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
 		array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
 		array( 'base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff' )
 	);
-	
+
 	wp_admin_css_color( 'ocean', _x( 'Ocean', 'admin color scheme' ),
-		admin_url( 'css/colors/ocean/colors.min.css' ),
+		admin_url( "css/colors/ocean/colors$suffix.css" ),
 		array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
 		array( 'base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff' )
 	);
 
 	wp_admin_css_color( 'coffee', _x( 'Coffee', 'admin color scheme' ),
-		admin_url( 'css/colors/coffee/colors.min.css' ),
+		admin_url( "css/colors/coffee/colors$suffix.css" ),
 		array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
 		array( 'base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff' )
 	);
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 873b4bb564..1c3f0343fe 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -551,7 +551,7 @@ function wp_default_styles( &$styles ) {
 
 	$suffix = SCRIPT_DEBUG ? '' : '.min';
 
-	$rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install', 'colors' );
+	$rtl_styles = array( 'wp-admin', 'ie', 'media', 'admin-bar', 'customize-controls', 'media-views', 'wp-color-picker', 'wp-pointer', 'editor-buttons', 'farbtastic', 'wp-auth-check', 'wp-jquery-ui-dialog', 'media-views', 'buttons', 'install' );
 
 	$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array( 'open-sans', 'dashicons' ) );
 
@@ -699,9 +699,6 @@ function wp_style_loader_src( $src, $handle ) {
 		$parsed = parse_url( $src );
 		$url = $color->url;
 
-		if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG )
-			$url = preg_replace( '/.min.css$|.min.css(?=\?)/', '.css', $url );
-
 		if ( isset($parsed['query']) && $parsed['query'] ) {
 			wp_parse_str( $parsed['query'], $qv );
 			$url = add_query_arg( $qv, $url );