http://www.mediawiki.org/wiki/Special:Code/MediaWiki/68862
Revision: 68862
Author: tparscal
Date: 2010-07-01 23:59:58 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
Debug core stuff should only come through with core stuff...
Modified Paths:
--------------
branches/resourceloader/phase3/includes/ResourceLoader.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===================================================================
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-07-01
23:54:35 UTC (rev 68861)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-07-01
23:59:58 UTC (rev 68862)
@@ -138,14 +138,13 @@
$retval .= file_get_contents( $script );
}
}
- $retval .= $this->getLoaderJS();
- }
- if ( $this->useDebugMode ) {
- // TODO: file_get_contents() errors?
- // TODO: CACHING!
- foreach ( self::$debugScripts as $script ) {
- if ( file_exists( $script ) ) {
- $retval .= file_get_contents( $script );
+ if ( $this->useDebugMode ) {
+ // TODO: file_get_contents() errors?
+ // TODO: CACHING!
+ foreach ( self::$debugScripts as $script ) {
+ if ( file_exists( $script ) ) {
+ $retval .= file_get_contents(
$script );
+ }
}
}
$retval .= $this->getLoaderJS();
@@ -190,7 +189,7 @@
$retval .= "mw.loader.implement( '$module', function()
{ $script }, '$style', { $messages } );\n";
}
- if ( $this->useJSMin ) {
+ if ( !$this->useDebugMode && $this->useJSMin ) {
$retval = $this->jsMin( $retval );
}
return $retval;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
