mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-12 23:14:18 +01:00
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:
@@ -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');
|
||||
|
||||
Reference in New Issue
Block a user