From 43dd0b7df8afb764581ee052ce94c9ac197d9529 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 10 Jan 2023 10:51:09 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02013=20Fix=20regression=20when=20install?= =?UTF-8?q?ing=20from=20scratch=20Error=20was=20"Call=20to=20a=20member=20?= =?UTF-8?q?function=20UpdateFromParams()=20on=20null"=20Regression=20intro?= =?UTF-8?q?duced=20by=2015d3201a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- setup/applicationinstaller.class.inc.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/setup/applicationinstaller.class.inc.php b/setup/applicationinstaller.class.inc.php index 3057e2622..22711bcd5 100644 --- a/setup/applicationinstaller.class.inc.php +++ b/setup/applicationinstaller.class.inc.php @@ -565,15 +565,16 @@ class ApplicationInstaller if (($sEnvironment == 'production') && !$bIsAlreadyInMaintenanceMode) { $sConfigFilePath = utils::GetConfigFilePath($sEnvironment); - if (is_file($sConfigFilePath)) - { + if (is_file($sConfigFilePath)) { $oConfig = new Config($sConfigFilePath); - } - else - { + } else { $oConfig = null; } - $oConfig->UpdateFromParams($aParamValues); + + if (false === is_null($oConfig)) { + $oConfig->UpdateFromParams($aParamValues); + } + SetupUtils::EnterMaintenanceMode($oConfig); }