composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	setup/itopdesignformat.class.inc.php
This commit is contained in:
Molkobain
2022-01-27 16:09:22 +01:00
parent 44c18395b3 b89d181125
commit 3bec96abe1
102 changed files with 986 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php
View File

@@ -413,7 +413,7 @@ class CriterionToOQL extends CriterionConversionAbstract
$oCriteria = $oSearch->GetCriteria();
$aArgs = MetaModel::PrepareQueryArguments(array(), $oSearch->GetInternalParams(), $oSearch->GetExpectedArguments() );
$oSearch->ResetCondition();
$sCondition = $oCriteria->Render($aArgs);
$sCondition = $oCriteria->RenderExpression(false, $aArgs);
}
} catch (Exception $e)
{