From 15eee1c4f5ded5f2b14d93cff65863ca77317716 Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 17 Feb 2010 20:25:51 +0000 Subject: [PATCH] Remove STYLE_DEBUG constant, SCRIPT_DEBUG now handles both scripts and CSS. Fixes #12237 git-svn-id: http://svn.automattic.com/wordpress/trunk@13183 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/script-loader.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index a081c00e54..fcd333ff64 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -8,8 +8,7 @@ * file. * * Several constants are used to manage the loading, concatenating and compression of scripts and CSS: - * define('SCRIPT_DEBUG', true); loads the development (non-minified) versions of all scripts and disables compression and concatenation, - * define('STYLE_DEBUG', true); loads the development (non-minified) versions of all CSS and disables compression and concatenation, + * define('SCRIPT_DEBUG', true); loads the development (non-minified) versions of all scripts and CSS, and disables compression and concatenation, * define('CONCATENATE_SCRIPTS', false); disables compression and concatenation of scripts and CSS, * define('COMPRESS_SCRIPTS', false); disables compression of scripts, * define('COMPRESS_CSS', false); disables compression of CSS, @@ -427,7 +426,7 @@ function wp_default_styles( &$styles ) { $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr'; $styles->default_dirs = array('/wp-admin/'); - $suffix = defined('STYLE_DEBUG') && STYLE_DEBUG ? '.dev' : ''; + $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; $rtl_styles = array( 'wp-admin', 'global', 'colors', 'dashboard', 'ie', 'install', 'login', 'media', 'theme-editor', 'upload', 'widgets', 'press-this', 'plugin-install', 'farbtastic' ); @@ -547,7 +546,7 @@ function wp_style_loader_src( $src, $handle ) { $parsed = parse_url( $src ); $url = $color->url; - if ( defined('STYLE_DEBUG') && STYLE_DEBUG ) + if ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) $url = preg_replace('/.css$|.css(?=\?)/', '.dev.css', $url); if ( isset($parsed['query']) && $parsed['query'] ) {