Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resourceloader: Omit parameter 'lang' from image URLs when not vary

Browse source 
The parameter 'lang' is only added to the URL when the image vary on the
language or on the direction.

Also omit the parameter 'lang' when the value is equal to
ResourceLoaderContext::DEFAULT_LANG.

This change makes the URLs shorter and reduces the size of the
stylesheets.

This change also improves caching because the URLs do not vary on the
language for the same image.

Change-Id: Id7d8ecc7d95747f3c157f9abc12e8489e5085aff
This commit is contained in:
Fomafix 2019-06-27 14:28:17 +02:00 committed by Krinkle
parent f92a1a6db3
commit 01a4a58982
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
includes/resourceloader/ResourceLoaderImage.php
View file

@ -214,10 +214,13 @@ class ResourceLoaderImage {
'image' => $this->getName(),
'variant' => $variant,
'format' => $format,
'lang' => $context->getLanguage(),
'skin' => $context->getSkin(),
'version' => $context->getVersion(),
];
if ( $this->varyOnLanguage() ) {
$query['lang'] = $context->getLanguage();
}
// The following parameters are at the end to keep the original order of the parameters.
$query['skin'] = $context->getSkin();
$query['version'] = $context->getVersion();
return wfAppendQuery( $script, $query );
}
@ -446,4 +449,16 @@ class ResourceLoaderImage {
return $png ?: false;
}
}
/**
* Check if the image depends on the language.
*
* @return bool
*/
private function varyOnLanguage() {
return is_array( $this->descriptor ) && (
isset( $this->descriptor['ltr'] ) ||
isset( $this->descriptor['rtl'] ) ||
isset( $this->descriptor['lang'] ) );
}
}