Merge "Revert "Use display name in category page subheadings if provided""

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderStartUpModule.php

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index c854fa2..8970620 100644 (file)
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -311,14 +311,12 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
         */
        public static function getStartupModulesUrl( ResourceLoaderContext $context ) {
                $rl = $context->getResourceLoader();
-               $moduleNames = self::getStartupModules();
 
                $derivative = new DerivativeResourceLoaderContext( $context );
-               $derivative->setModules( $moduleNames );
+               $derivative->setModules( self::getStartupModules() );
                $derivative->setOnly( 'scripts' );
-               $derivative->setVersion(
-                       $rl->getCombinedVersion( $context, $moduleNames )
-               );
+               // Must setModules() before makeVersionQuery()
+               $derivative->setVersion( $rl->makeVersionQuery( $derivative ) );
 
                return $rl->createLoaderURL( 'local', $derivative );
        }