Changeset 26147

Timestamp:

11/14/2013 12:02:36 AM (11 years ago)

Author:

nacin

Message:

Remove SCRIPT_DEBUG reference from register_admin_color_schemes().

Instead, script-loader.php handles converting .min.css to .css when SCRIPT_DEBUG is on, and has since r21592. (This was done for compatibility with plugin color schemes that used .css and .dev.css.)

see #25858.

File:

• trunk/src/wp-includes/general-template.php (modified) (1 diff)

trunk/src/wp-includes/general-template.php

@@ -2108 +2108 @@
  */
 function register_admin_color_schemes() {
-    $suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
-
     wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
-        admin_url( "css/colors-fresh$suffix.css" ),
+        admin_url( 'css/colors-fresh.min.css' ),
         array( '#222', '#333', '#0074a2', '#2ea2cc' )
     );
 
     // Other color schemes are not available when running out of src
-    if ( ! strpos( $GLOBALS['wp_version'], '-src' ) ) {
-        wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
-            admin_url( "css/color-schemes/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/color-schemes/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/color-schemes/midnight/colors$suffix.css" ),
-            array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
-            array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
-        );
-    }
+    if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) )
+        return;
+
+    wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
+        admin_url( 'css/color-schemes/light/colors.min.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/color-schemes/blue/colors.min.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/color-schemes/midnight/colors.min.css' ),
+        array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
+        array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
+    );
 }