http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72328
Revision: 72328
Author: tparscal
Date: 2010-09-03 22:48:03 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Removed double-inclusion of style-only module requests - one of which was
adding styles as script tags to the body.
Modified Paths:
--------------
branches/resourceloader/phase3/includes/OutputPage.php
Modified: branches/resourceloader/phase3/includes/OutputPage.php
===================================================================
--- branches/resourceloader/phase3/includes/OutputPage.php 2010-09-03
22:12:12 UTC (rev 72327)
+++ branches/resourceloader/phase3/includes/OutputPage.php 2010-09-03
22:48:03 UTC (rev 72328)
@@ -2309,10 +2309,6 @@
$scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName()
) . "\n";
// Support individual script requests in debug mode
if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal(
'debug' ) !== 'false' ) {
- // Styles
- foreach ( $this->getModuleStyles() as $name ) {
- $scripts .= self::makeResourceLoaderLink( $sk,
$name, 'styles' );
- }
// Scripts
foreach ( $this->getModuleScripts() as $name ) {
$scripts .= self::makeResourceLoaderLink( $sk,
$name, 'scripts' );
@@ -2322,10 +2318,6 @@
$scripts .= self::makeResourceLoaderLink( $sk,
$name, 'messages' );
}
} else {
- // Styles
- if ( count( $this->getModuleStyles() ) ) {
- $scripts .= self::makeResourceLoaderLink( $sk,
$this->getModuleStyles(), 'styles' );
- }
// Scripts
if ( count( $this->getModuleScripts() ) ) {
$scripts .= self::makeResourceLoaderLink( $sk,
$this->getModuleScripts(), 'scripts' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
