X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Finstaller%2FLocalSettingsGenerator.php;h=6d70338cf95056d26aba1f7d039c21566ac12c63;hp=a9710eb9f626ba3359ea188142b79e9bf2dcc69e;hb=50212e6d0ef2cdcc63aece18c8d77c9c251be7ed;hpb=ed92b00ea5b1af2638948beaf334bc28e22ff4b6 diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index a9710eb9f6..6d70338cf9 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 ) { @@ -187,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 ); @@ -301,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 "