Index: wp-includes/class.wp-scripts.php
===================================================================
--- wp-includes/class.wp-scripts.php (revision 18341)
+++ wp-includes/class.wp-scripts.php (working copy)
@@ -100,7 +100,7 @@
$src = $this->registered[$handle]->src;
- if ( $this->do_concat ) {
+ if ( $this->do_concat && ( !isset($this->registered[$handle]->extra['conditional']) || !$this->registered[$handle]->extra['conditional'] ) ) {
$srce = apply_filters( 'script_loader_src', $src, $handle );
if ( $this->in_default_dir($srce) ) {
$this->print_code .= $this->print_scripts_l10n( $handle, false );
@@ -122,10 +122,16 @@
$src = add_query_arg('ver', $ver, $src);
$src = esc_url(apply_filters( 'script_loader_src', $src, $handle ));
- if ( $this->do_concat )
+ if ( $this->do_concat && ( !isset($this->registered[$handle]->extra['conditional']) || !$this->registered[$handle]->extra['conditional'] ) ) {
$this->print_html .= "\n";
- else
- echo "\n";
+ } else {
+ $start_cond = $end_cond = '';
+ if ( isset($this->registered[$handle]->extra['conditional']) && $this->registered[$handle]->extra['conditional'] ) {
+ $start_cond = "\n";
+ }
+ echo "{$start_cond}\n{$end_cond}";
+ }
return true;
}