| Index: branches/resourceloader/phase3/includes/OutputPage.php |
| — | — | @@ -2249,9 +2249,17 @@ |
| 2250 | 2250 | $scripts = ''; |
| 2251 | 2251 | // Include base modules and wikibits legacy code |
| 2252 | 2252 | if ( $wgRequest->getVal( 'debug' ) === 'true' || $wgRequest->getBool( 'debug' ) ) { |
| 2253 | | - foreach ( $this->getResources() as $resource ) { |
| 2254 | | - $scripts .= self::makeResourceLoaderLinkedScript( $sk, $resource ); |
| | 2253 | + $skipped = array(); |
| | 2254 | + foreach ( $this->getResources() as $name ) { |
| | 2255 | + $module = ResourceLoader::getModule( $name ); |
| | 2256 | + if ( $module->isRaw() ) { |
| | 2257 | + $scripts .= self::makeResourceLoaderLinkedScript( $sk, $name ); |
| | 2258 | + $skipped[] = $name; |
| | 2259 | + } |
| 2255 | 2260 | } |
| | 2261 | + foreach ( $skipped as $name ) { |
| | 2262 | + $scripts .= self::makeResourceLoaderLinkedScript( $sk, $name ); |
| | 2263 | + } |
| 2256 | 2264 | } else { |
| 2257 | 2265 | $scripts .= self::makeResourceLoaderLinkedScript( $sk, $this->getResources() ); |
| 2258 | 2266 | } |