X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderContext.php;h=c4e9884a1ee9be8da6ca336e1284ae068eac4b60;hb=75e3edb416aea15e4be2dfb0a4b66beef81f45f1;hp=cbb0beca8d7bfc8de21beea260c9fc6bc8a32574;hpb=d19826aa35b206847a568a4b2c1c9ffaa615fca5;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php index cbb0beca8d..c4e9884a1e 100644 --- a/includes/resourceloader/ResourceLoaderContext.php +++ b/includes/resourceloader/ResourceLoaderContext.php @@ -63,12 +63,8 @@ class ResourceLoaderContext implements MessageLocalizer { $this->request = $request; $this->logger = $resourceLoader->getLogger(); - // Future developers: Avoid use of getVal() in this class, which performs - // expensive UTF normalisation by default. Use getRawVal() instead. - // Values here are either one of a finite number of internal IDs, - // or previously-stored user input (e.g. titles, user names) that were passed - // to this endpoint by ResourceLoader itself from the canonical value. - // Values do not come directly from user input and need not match. + // Future developers: Use WebRequest::getRawVal() instead getVal(). + // The getVal() method performs slow Language+UTF logic. (f303bb9360) // List of modules $modules = $request->getRawVal( 'modules' ); @@ -98,9 +94,12 @@ class ResourceLoaderContext implements MessageLocalizer { } /** - * Expand a string of the form jquery.foo,bar|jquery.ui.baz,quux to - * an array of module names like [ 'jquery.foo', 'jquery.bar', - * 'jquery.ui.baz', 'jquery.ui.quux' ] + * Expand a string of the form `jquery.foo,bar|jquery.ui.baz,quux` to + * an array of module names like `[ 'jquery.foo', 'jquery.bar', + * 'jquery.ui.baz', 'jquery.ui.quux' ]`. + * + * This process is reversed by ResourceLoader::makePackedModulesString(). + * * @param string $modules Packed module name list * @return array Array of module names */ @@ -182,7 +181,6 @@ class ResourceLoaderContext implements MessageLocalizer { $lang = $this->getRequest()->getRawVal( 'lang', '' ); // Stricter version of RequestContext::sanitizeLangCode() if ( !Language::isValidBuiltInCode( $lang ) ) { - wfDebug( "Invalid user language code\n" ); $lang = $this->getResourceLoader()->getConfig()->get( 'LanguageCode' ); } $this->language = $lang;