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

MessageCache: Don't get a ParserOptions for $wgUser before the end of Setup.php

Browse source 
Until Setup.php completes, we can't access the "current" user and trying
to do so logs a warning. So don't try.

Bug: T124367
Change-Id: If31230407829c04f34d9cfefcbb97edacb949b6d
This commit is contained in:
Brad Jorsch 2016-01-29 14:30:25 -05:00
parent 2dd27a8257
commit 058aec4c76
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/cache/MessageCache.php vendored
View file

@ -168,7 +168,18 @@ class MessageCache {
* @return ParserOptions
*/
function getParserOptions() {
global $wgFullyInitialised, $wgContLang;
if ( !$this->mParserOptions ) {
if ( !$wgFullyInitialised ) {
// $wgUser isn't unstubbable yet, so don't try to get a
// ParserOptions for it. And don't cache this ParserOptions
// either.
$po = new ParserOptions( new User, $wgContLang );
$po->setEditSection( false );
return $po;
}
$this->mParserOptions = new ParserOptions;
$this->mParserOptions->setEditSection( false );
}