diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php index de92d4450..8ff3a9b96 100644 --- a/setup/setuppage.class.inc.php +++ b/setup/setuppage.class.inc.php @@ -75,28 +75,28 @@ class SetupPage extends NiceWebPage return ''; } - public function info($sText) + public function info($sText, $sTextForLog = null) { $this->add("

$sText

\n"); - SetupLog::Info($sText); + SetupLog::Info($sTextForLog ?? $sText); } - public function ok($sText) + public function ok($sText, $sTextForLog = null) { $this->add("
Success:$sText
"); - SetupLog::Ok($sText); + SetupLog::Ok($sTextForLog ?? $sText); } - public function warning($sText) + public function warning($sText, $sTextForLog = null) { $this->add("
Warning:$sText
"); - SetupLog::Warning($sText); + SetupLog::Warning($sTextForLog ?? $sText); } - public function error($sText) + public function error($sText, $sTextForLog = null) { $this->add("
$sText
"); - SetupLog::Error($sText); + SetupLog::Error($sTextForLog ?? $sText); } public function form($aData) diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index 696ce5970..fb56a294a 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -1421,7 +1421,7 @@ class WizStepModulesChoice extends WizardStep } catch(MissingDependencyException $e) { - $oPage->warning($e->getHtmlDesc()); + $oPage->warning($e->getHtmlDesc(), $e->getMessage()); } $this->bUpgrade = ($this->oWizard->GetParameter('install_mode') != 'install');