X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Finstaller%2FLocalSettingsGenerator.php;h=697188ef081b7f0ed61503c6fd22d04e00c5fa0f;hb=4427b84407e03275bdb62ca58a0fde14f3dc7be6;hp=1d7c7f22fcdcab8af541fe753d4a831ca29ca7a5;hpb=e5e7d75a16d09142e42aa20d2ab3aaccdc6a3c79;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 1d7c7f22fc..bdaeaca86c 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -41,8 +41,6 @@ class LocalSettingsGenerator {
 	protected $installer;
 
 	/**
-	 * Constructor.
-	 *
 	 * @param Installer $installer
 	 */
 	public function __construct( Installer $installer ) {
@@ -69,7 +67,7 @@ class LocalSettingsGenerator {
 			$db->getGlobalNames()
 		);
 
-		$unescaped = [ 'wgRightsIcon', 'wgLogo' ];
+		$unescaped = [ 'wgRightsIcon', 'wgLogo', '_Caches' ];
 		$boolItems = [
 			'wgEnableEmail', 'wgEnableUserEmail', 'wgEnotifUserTalk',
 			'wgEnotifWatchlist', 'wgEmailAuthentication', 'wgEnableUploads', 'wgUseInstantCommons',
@@ -98,7 +96,7 @@ class LocalSettingsGenerator {
 	 * For $wgGroupPermissions, set a given ['group']['permission'] value.
 	 * @param string $group Group name
 	 * @param array $rightsArr An array of permissions, in the form of:
-	 *   array( 'right' => true, 'right2' => false )
+	 *   [ 'right' => true, 'right2' => false ]
 	 */
 	public function setGroupRights( $group, $rightsArr ) {
 		$this->groupPermissions[$group] = $rightsArr;
@@ -109,7 +107,7 @@ class LocalSettingsGenerator {
 	 *
 	 * @param string $string
 	 *
-	 * @return string
+	 * @return string|false
 	 */
 	public static function escapePhpString( $string ) {
 		if ( is_array( $string ) || is_object( $string ) ) {
@@ -241,7 +239,7 @@ class LocalSettingsGenerator {
 		}
 
 		if ( !$this->values['wgShellLocale'] ) {
-			$this->values['wgShellLocale'] = 'en_US.UTF-8';
+			$this->values['wgShellLocale'] = 'C.UTF-8';
 			$locale = '#';
 		} else {
 			$locale = '';