X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FLocalSettingsGenerator.php;h=6d70338cf95056d26aba1f7d039c21566ac12c63;hp=bdaeaca86c2f60384d4932a171c690ed19bd7417;hb=50212e6d0ef2cdcc63aece18c8d77c9c251be7ed;hpb=dcae3733c98cff011e3170bb4eb8748a31f70496

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index bdaeaca86c..6d70338cf9 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -185,7 +185,7 @@ class LocalSettingsGenerator {
 			$jsonFile = 'skin.json';
 			$function = 'wfLoadSkin';
 		} else {
-			throw new InvalidArgumentException( '$dir was not "extensions" or "skins' );
+			throw new InvalidArgumentException( '$dir was not "extensions" or "skins"' );
 		}
 
 		$encName = self::escapePhpString( $name );
@@ -299,6 +299,12 @@ class LocalSettingsGenerator {
 		}
 
 		$mcservers = $this->buildMemcachedServerList();
+		if ( file_exists( dirname( __DIR__ ) . '/PlatformSettings.php' ) ) {
+			$platformSettings = "\n## Include platform/distribution defaults";
+			$platformSettings .= "\nrequire_once \"\$IP/includes/PlatformSettings.php\";";
+		} else {
+			$platformSettings = '';
+		}
 
 		return "<?php
 # This file was automatically generated by the MediaWiki {$GLOBALS['wgVersion']}
@@ -316,6 +322,7 @@ class LocalSettingsGenerator {
 if ( !defined( 'MEDIAWIKI' ) ) {
 	exit;
 }
+{$platformSettings}
 
 ## Uncomment this to disable output compression
 # \$wgDisableOutputCompression = true;