From 5a922af756f605f6e346f7e29bd01e5eacc58ed7 Mon Sep 17 00:00:00 2001 From: azaozz Date: Wed, 29 Apr 2009 06:25:49 +0000 Subject: [PATCH] Don't concatenate scripts when SCRIPT_DEBUG is set, fixes #9675 git-svn-id: http://svn.automattic.com/wordpress/trunk@11119 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/script-loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 5f31c550a..d3504dd1d 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -690,7 +690,7 @@ function script_concat_settings() { if ( ! isset($concatenate_scripts) ) { $concatenate_scripts = defined('CONCATENATE_SCRIPTS') ? CONCATENATE_SCRIPTS : true; - if ( ! is_admin() || ( $concatenate_scripts && -1 == get_user_option('concatenate_scripts') ) ) + if ( ! is_admin() || ( defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ) ) $concatenate_scripts = false; }