| Index: trunk/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -444,6 +444,7 @@ |
| 445 | 445 | return '/* No modules requested. Max made me put this here */'; |
| 446 | 446 | } |
| 447 | 447 | |
| | 448 | + wfProfileIn( __METHOD__ ); |
| 448 | 449 | // Pre-fetch blobs |
| 449 | 450 | if ( $context->shouldIncludeMessages() ) { |
| 450 | 451 | try { |
| — | — | @@ -524,15 +525,16 @@ |
| 525 | 526 | } |
| 526 | 527 | } |
| 527 | 528 | |
| 528 | | - if ( $context->getDebug() ) { |
| 529 | | - return $exceptions . $out; |
| 530 | | - } else { |
| | 529 | + if ( !$context->getDebug() ) { |
| 531 | 530 | if ( $context->getOnly() === 'styles' ) { |
| 532 | | - return $exceptions . $this->filter( 'minify-css', $out ); |
| | 531 | + $out = $this->filter( 'minify-css', $out ); |
| 533 | 532 | } else { |
| 534 | | - return $exceptions . $this->filter( 'minify-js', $out ); |
| | 533 | + $out = $this->filter( 'minify-js', $out ); |
| 535 | 534 | } |
| 536 | 535 | } |
| | 536 | + |
| | 537 | + wfProfileOut( __METHOD__ ); |
| | 538 | + return $exceptions . $out; |
| 537 | 539 | } |
| 538 | 540 | |
| 539 | 541 | /* Static Methods */ |