Merge remote-tracking branch 'origin/support/3.0' into develop

# Conflicts:
#	pages/UI.php
#	tests/php-unit-tests/unitary-tests/application/utilsTest.php
This commit is contained in:
Eric Espie
2023-06-01 16:59:59 +02:00
5 changed files with 6 additions and 6 deletions

View File

@@ -592,8 +592,8 @@ try
if ($sQuery !== $sFullText) {
$sQueryLabel = $sFullText;
}
GlobalSearchHelper::AddQueryToHistory($sQuery, $sQueryIconUrl, $sQueryLabel);
$oP->SetBlockParam('ibo-global-search.sQuery', $sQuery);
GlobalSearchHelper::AddQueryToHistory(utils::EscapeHtml($sQuery), $sQueryIconUrl, $sQueryLabel);
$oP->SetBlockParam('ibo-global-search.sQuery', utils::EscapeHtml($sQuery));
// Check the needle length
$iMinLenth = MetaModel::GetConfig()->Get('full_text_needle_min');