Merge "In Installer, set the context language early to avoid loading from User"

diff --combined includes/installer/Installer.php
index ca1d8a3,f7458c4..40e51f0
--- 1/includes/installer/Installer.php
--- 2/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@@ -361,6 -361,10 +361,10 @@@ abstract class Installer 
        public function __construct() {
                global $wgMessagesDirs, $wgUser;
  
+               // Don't attempt to load user language options (T126177)
+               // This will be overridden in the web installer with the user-specified language
+               RequestContext::getMain()->setLanguage( 'en' );
+ 
                // Disable the i18n cache
                Language::getLocalisationCache()->disableBackend();
                // Disable LoadBalancer and wfGetDB etc.
@@@ -385,7 -389,6 +389,7 @@@
  
                // Having a user with id = 0 safeguards us from DB access via User::loadOptions().
                $wgUser = User::newFromId( 0 );
 +              RequestContext::getMain()->setUser( $wgUser );
  
                $this->settings = $this->internalDefaults;
  
@@@ -406,7 -409,7 +410,7 @@@
                }
  
                $this->parserTitle = Title::newFromText( 'Installer' );
-               $this->parserOptions = new ParserOptions; // language will be wrong :(
+               $this->parserOptions = new ParserOptions( $wgUser ); // language will be wrong :(
                $this->parserOptions->setEditSection( false );
        }