r72328 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72327‎ | r72328 | r72329 >
Date:22:48, 3 September 2010
Author:tparscal
Status:ok
Tags:
Comment:
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) (history)

Diff [purge]

Index: branches/resourceloader/phase3/includes/OutputPage.php
@@ -2309,10 +2309,6 @@
23102310 $scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName() ) . "\n";
23112311 // Support individual script requests in debug mode
23122312 if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal( 'debug' ) !== 'false' ) {
2313 - // Styles
2314 - foreach ( $this->getModuleStyles() as $name ) {
2315 - $scripts .= self::makeResourceLoaderLink( $sk, $name, 'styles' );
2316 - }
23172313 // Scripts
23182314 foreach ( $this->getModuleScripts() as $name ) {
23192315 $scripts .= self::makeResourceLoaderLink( $sk, $name, 'scripts' );
@@ -2322,10 +2318,6 @@
23232319 $scripts .= self::makeResourceLoaderLink( $sk, $name, 'messages' );
23242320 }
23252321 } else {
2326 - // Styles
2327 - if ( count( $this->getModuleStyles() ) ) {
2328 - $scripts .= self::makeResourceLoaderLink( $sk, $this->getModuleStyles(), 'styles' );
2329 - }
23302322 // Scripts
23312323 if ( count( $this->getModuleScripts() ) ) {
23322324 $scripts .= self::makeResourceLoaderLink( $sk, $this->getModuleScripts(), 'scripts' );

Status & tagging log