Merge remote-tracking branch 'origin/develop' into feature/MVCTwigTags3.0

This commit is contained in:
Eric
2021-01-20 10:43:12 +01:00
16 changed files with 1036 additions and 791 deletions

View File

@@ -112,7 +112,7 @@ class GlobalSearchHelper
// Add HTML label if missing
if(!isset($aHistoryEntries[$iIdx]['label_html']))
{
$aHistoryEntries[$iIdx]['label_html'] = utils::HtmlEntities($aHistoryEntries[$iIdx]['query']);
$aHistoryEntries[$iIdx]['label_html'] = utils::EscapeHtml($aHistoryEntries[$iIdx]['query']);
}
// Set absolute URL

View File

@@ -108,7 +108,7 @@ class QuickCreateHelper
// Add class label
if(!isset($aHistoryEntries[$iIdx]['label_html']))
{
$aHistoryEntries[$iIdx]['label_html'] = utils::HtmlEntities(MetaModel::GetName($sClass));
$aHistoryEntries[$iIdx]['label_html'] = utils::EscapeHtml(MetaModel::GetName($sClass));
}
// Add url