X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderContext.php;h=95a81e6d4b8831ac90729e3b864e145a5d5d4a8c;hb=933a00217017bf56eb5de3e5d42e1611389f1f54;hp=58152ea08327f8a327cf9e4657f51545b5e3d1d7;hpb=3074a4521a18e78e52ba44cc7c185bac7af4a866;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index 58152ea083..95a81e6d4b 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -30,6 +30,9 @@ use MediaWiki\MediaWikiServices; * of a specific loader request. */ class ResourceLoaderContext implements MessageLocalizer { + const DEFAULT_LANG = 'qqx'; + const DEFAULT_SKIN = 'fallback'; + protected $resourceLoader; protected $request; protected $logger; @@ -88,7 +91,7 @@ class ResourceLoaderContext implements MessageLocalizer { // The 'skin' parameter is required. (Not yet enforced.) // For requests without a known skin specified, // use MediaWiki's 'fallback' skin for skin-specific decisions. - $this->skin = 'fallback'; + $this->skin = self::DEFAULT_SKIN; } } @@ -134,6 +137,8 @@ class ResourceLoaderContext implements MessageLocalizer { } /** + * @deprecated since 1.34 Use ResourceLoaderModule::getConfig instead + * inside module methods. Use ResourceLoader::getConfig elsewhere. * @return Config */ public function getConfig() { @@ -148,6 +153,8 @@ class ResourceLoaderContext implements MessageLocalizer { } /** + * @deprecated since 1.34 Use ResourceLoaderModule::getLogger instead + * inside module methods. Use ResourceLoader::getLogger elsewhere. * @since 1.27 * @return \Psr\Log\LoggerInterface */ @@ -174,7 +181,7 @@ class ResourceLoaderContext implements MessageLocalizer { if ( !Language::isValidBuiltInCode( $lang ) ) { // The 'lang' parameter is required. (Not yet enforced.) // If omitted, localise with the dummy language code. - $lang = 'qqx'; + $lang = self::DEFAULT_LANG; } $this->language = $lang; } @@ -186,8 +193,10 @@ class ResourceLoaderContext implements MessageLocalizer { */ public function getDirection() { if ( $this->direction === null ) { - $this->direction = $this->getRequest()->getRawVal( 'dir' ); - if ( !$this->direction ) { + $direction = $this->getRequest()->getRawVal( 'dir' ); + if ( $direction === 'ltr' || $direction === 'rtl' ) { + $this->direction = $direction; + } else { // Determine directionality based on user language (T8100) $this->direction = Language::factory( $this->getLanguage() )->getDir(); }