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

$sText

\n"); - $this->log_info($sText); + self::log_info($sTextForLog ?? $sText); } - public function ok($sText) + public function ok($sText, $sTextForLog = null) { $this->add("
Success:$sText
"); - $this->log_ok($sText); + self::log_ok($sTextForLog ?? $sText); } - public function warning($sText) + public function warning($sText, $sTextForLog = null) { $this->add("
Warning:$sText
"); - $this->log_warning($sText); + self::log_warning($sTextForLog ?? $sText); } - public function error($sText) + public function error($sText, $sTextForLog = null) { $this->add("
$sText
"); - $this->log_error($sText); + self::log_error($sTextForLog ?? $sText); } public function form($aData) diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index 9adb5692c..097aa07cd 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -1386,7 +1386,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');