From 35852fee74d9d23fe8192fae4d4341b4ab4817ee Mon Sep 17 00:00:00 2001 From: Fomafix Date: Sun, 21 Aug 2022 13:50:47 +0000 Subject: [PATCH] Use WebRequest::getRawVal instead of WebRequest::getText The UTF-8 normalization for the URL attributes `languagecode`, `uselang` and `setlang` are not needed. Change-Id: Ib204629fb15e2578bba09be4c40d0210eb81dd77 --- includes/Api/ApiULSSetLanguage.php | 2 +- includes/Hooks.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/Api/ApiULSSetLanguage.php b/includes/Api/ApiULSSetLanguage.php index d5fc2047..80d1ff55 100644 --- a/includes/Api/ApiULSSetLanguage.php +++ b/includes/Api/ApiULSSetLanguage.php @@ -59,7 +59,7 @@ class ApiULSSetLanguage extends ApiBase { $this->dieWithError( [ 'apierror-mustbeposted', $request->getText( 'action' ) ] ); } - $languageCode = $request->getText( 'languagecode' ); + $languageCode = $request->getRawVal( 'languagecode', '' ); if ( !$this->languageNameUtils->isSupportedLanguage( $languageCode ) ) { $this->dieWithError( [ 'apierror-invalidlang', $this->encodeParamName( 'languagecode' ) ] diff --git a/includes/Hooks.php b/includes/Hooks.php index cdfd8a18..019d0891 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -313,7 +313,7 @@ class Hooks implements if ( // uselang can be used for temporary override of language preference - $request->getText( 'uselang' ) || + $request->getRawVal( 'uselang' ) || // Registered user: use preferences, only when safe to load - T267445 ( $user->isSafeToLoad() && $user->isRegistered() ) ) { @@ -524,7 +524,7 @@ class Hooks implements } private function getSetLang( OutputPage $out ): ?string { - $setLangCode = $out->getRequest()->getText( 'setlang' ); + $setLangCode = $out->getRequest()->getRawVal( 'setlang' ); if ( $setLangCode && $this->languageNameUtils->isSupportedLanguage( $setLangCode ) ) { return $setLangCode; }