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

Merge "Use ParserOptions::newFromContext in MessageCache"

Browse source
This commit is contained in:
jenkins-bot 2021-11-08 21:45:40 +00:00 committed by Gerrit Code Review
commit 5729022456
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/cache/MessageCache.php vendored
View file

@ -204,7 +204,8 @@ class MessageCache implements LoggerAwareInterface {
*/
private function getParserOptions() {
if ( !$this->mParserOptions ) {
$user = RequestContext::getMain()->getUser();
$context = RequestContext::getMain();
$user = $context->getUser();
if ( !$user->isSafeToLoad() ) {
// It isn't safe to use the context user yet, so don't try to get a
// ParserOptions for it. And don't cache this ParserOptions
@ -214,7 +215,7 @@ class MessageCache implements LoggerAwareInterface {
return $po;
}
$this->mParserOptions = new ParserOptions( $user );
$this->mParserOptions = ParserOptions::newFromContext( $context );
// Messages may take parameters that could come
// from malicious sources. As a precaution, disable
// the <html> parser tag when parsing messages.