diff --git a/application/exceptions/CoreException.php b/application/exceptions/CoreException.php
index f8afd2e5c..178b5397d 100644
--- a/application/exceptions/CoreException.php
+++ b/application/exceptions/CoreException.php
@@ -67,7 +67,7 @@ class CoreException extends Exception
public function getHtmlDesc($sHighlightHtmlBegin = '', $sHighlightHtmlEnd = '')
{
- return $this->getMessage();
+ return utils::EscapeHtml($this->getMessage());
}
/**
diff --git a/setup/modulediscovery.class.inc.php b/setup/modulediscovery.class.inc.php
index 81482c678..96822a982 100644
--- a/setup/modulediscovery.class.inc.php
+++ b/setup/modulediscovery.class.inc.php
@@ -40,15 +40,17 @@ class MissingDependencyException extends CoreException
HTML;
foreach ($this->aModulesInfo as $sModuleId => $aModuleErrors) {
- $sModuleLabel = $aModuleErrors['module']['label'];
+ $sModuleLabel = utils::EscapeHtml($aModuleErrors['module']['label']);
+ $sModuleId = utils::EscapeHtml($sModuleId);
$aModuleMissingDependencies = $aModuleErrors['dependencies'];
$sErrorMessage .= <<{$sModuleLabel} ({$sModuleId}):
+ - $sModuleLabel ($sModuleId):
HTML;
foreach ($aModuleMissingDependencies as $sMissingModule) {
- $sErrorMessage .= "- {$sMissingModule}
";
+ $sMissingModule = utils::EscapeHtml($sMissingModule);
+ $sErrorMessage .= "- $sMissingModule
";
}
$sErrorMessage .= <<