Merge "Properly detect if CACHE_ACCEL is available in the installer"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 5 May 2017 20:52:19 +0000 (20:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 5 May 2017 20:52:19 +0000 (20:52 +0000)
1  2 
includes/installer/LocalSettingsGenerator.php

@@@ -69,7 -69,7 +69,7 @@@ class LocalSettingsGenerator 
                        $db->getGlobalNames()
                );
  
-               $unescaped = [ 'wgRightsIcon', 'wgLogo' ];
+               $unescaped = [ 'wgRightsIcon', 'wgLogo', '_Caches' ];
                $boolItems = [
                        'wgEnableEmail', 'wgEnableUserEmail', 'wgEnotifUserTalk',
                        'wgEnotifWatchlist', 'wgEmailAuthentication', 'wgEnableUploads', 'wgUseInstantCommons',
                }
  
                if ( !$this->values['wgShellLocale'] ) {
 -                      $this->values['wgShellLocale'] = 'en_US.UTF-8';
 +                      $this->values['wgShellLocale'] = 'C.UTF-8';
                        $locale = '#';
                } else {
                        $locale = '';