X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderStartUpModule.php;h=a578ece687c5371726cd6d494c26b5f009ddd31f;hb=b51076a84446d157bed511246450e70d26e0f945;hp=74164dfb9f92bbed28e8fe7dac7726bd21d5d655;hpb=e1611fec8d9578711921945465ab770a789501af;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php index 74164dfb9f..a578ece687 100644 --- a/includes/resourceloader/ResourceLoaderStartUpModule.php +++ b/includes/resourceloader/ResourceLoaderStartUpModule.php @@ -78,6 +78,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { 'wgServerName' => $conf->get( 'ServerName' ), 'wgUserLanguage' => $context->getLanguage(), 'wgContentLanguage' => $wgContLang->getCode(), + 'wgTranslateNumerals' => $conf->get( 'TranslateNumerals' ), 'wgVersion' => $conf->get( 'Version' ), 'wgEnableAPI' => $conf->get( 'EnableAPI' ), 'wgEnableWriteAPI' => $conf->get( 'EnableWriteAPI' ), @@ -216,16 +217,16 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { if ( $skipFunction !== null && !ResourceLoader::inDebugMode() ) { $skipFunction = $resourceLoader->filter( 'minify-js', $skipFunction, - // There will potentially be lots of these little string in the registrations + // There will potentially be lots of these little strings in the registrations // manifest, we don't want to blow up the startup module with - // "/* cache key: ... */" all over it in non-debug mode. + // "/* cache key: ... */" all over it. /* cacheReport = */ false ); } $registryData[$name] = array( 'version' => $versionHash, - 'dependencies' => $module->getDependencies(), + 'dependencies' => $module->getDependencies( $context ), 'group' => $module->getGroup(), 'source' => $module->getSource(), 'loader' => $module->getLoaderScript(), @@ -403,7 +404,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule { // Pre-populate versionHash with something because the loop over all modules below includes // the startup module (this module). // See ResourceLoaderModule::getVersionHash() for usage of this cache. - $this->versionHash[ $context->getHash() ] = null; + $this->versionHash[$context->getHash()] = null; return $rl->getCombinedVersion( $context, $rl->getModuleNames() ); }