diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 42a1a5088..b6997cdc4 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -2473,6 +2473,8 @@ class Config * @param string|null $sModulesDir * @param bool $bPreserveModuleSettings * + * @return void + * * @throws \Exception * @throws \CoreException */ diff --git a/setup/applicationinstaller.class.inc.php b/setup/applicationinstaller.class.inc.php index 38894c92f..19284686b 100644 --- a/setup/applicationinstaller.class.inc.php +++ b/setup/applicationinstaller.class.inc.php @@ -286,8 +286,9 @@ class ApplicationInstaller } } + $aParamValues = $this->oParams->GetParamForConfigArray(); self::DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sTargetEnvironment, - $bUseSymbolicLinks); + $bUseSymbolicLinks, $aParamValues); $aResult = array( 'status' => self::OK, @@ -510,7 +511,22 @@ class ApplicationInstaller } - protected static function DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sEnvironment, $bUseSymbolicLinks = null) + /** + * @param array $aSelectedModules + * @param string $sSourceDir + * @param string $sExtensionDir + * @param string $sTargetDir + * @param string $sEnvironment + * @param boolean $bUseSymbolicLinks + * @param array $aParamValues + * + * @return void + * @throws \ConfigException + * @throws \CoreException + * + * @since 3.1.0 N°2013 added the aParamValues param + */ + protected static function DoCompile($aSelectedModules, $sSourceDir, $sExtensionDir, $sTargetDir, $sEnvironment, $bUseSymbolicLinks = null, $aParamValues = []) { SetupLog::Info("Compiling data model."); @@ -520,7 +536,7 @@ class ApplicationInstaller if (empty($sSourceDir) || empty($sTargetDir)) { throw new Exception("missing parameter source_dir and/or target_dir"); - } + } $sSourcePath = APPROOT.$sSourceDir; $aDirsToScan = array($sSourcePath); @@ -554,6 +570,7 @@ class ApplicationInstaller { $oConfig = null; } + $oConfig->UpdateFromParams($aParamValues); SetupUtils::EnterMaintenanceMode($oConfig); }