From 03d81669f8ab74f30368c94b18a37aa63b8c2d3f Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Tue, 6 Sep 2016 19:31:22 -0700 Subject: [PATCH] resourceloader: Use createLoaderURL() in getStartupModulesUrl() Avoid manually crafting a url. The packing logic and key sorting logic is already in this method and keeps it central that way. Test plan: * Check output of /w/load.php?modules=startup&only=scripts. This is used to construct the url to 'jquery%2Cmediawiki'. No change in output. Change-Id: I51ba51b6e74d78761108341c0ee318699ca7952f --- .../ResourceLoaderStartUpModule.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index eb9788c0ce..c854fa26c9 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -313,17 +313,14 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { $rl = $context->getResourceLoader(); $moduleNames = self::getStartupModules(); - $query = [ - 'modules' => ResourceLoader::makePackedModulesString( $moduleNames ), - 'only' => 'scripts', - 'lang' => $context->getLanguage(), - 'skin' => $context->getSkin(), - 'debug' => $context->getDebug() ? 'true' : 'false', - 'version' => $rl->getCombinedVersion( $context, $moduleNames ), - ]; - // Ensure uniform query order - ksort( $query ); - return wfAppendQuery( wfScript( 'load' ), $query ); + $derivative = new DerivativeResourceLoaderContext( $context ); + $derivative->setModules( $moduleNames ); + $derivative->setOnly( 'scripts' ); + $derivative->setVersion( + $rl->getCombinedVersion( $context, $moduleNames ) + ); + + return $rl->createLoaderURL( 'local', $derivative ); } /** -- 2.20.1