composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix DBSearch::Intersect (de-duplicate aliases)

Browse Source
This commit is contained in:
Eric
2019-11-27 15:39:33 +01:00
parent d2543e9c67
commit 9c8c306df3
2 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/dbobjectsearch.class.php
View File

@@ -895,7 +895,7 @@ class DBObjectSearch extends DBSearch
/** @var DBObjectSearch $oExisting */
if ($oExisting->GetClass() == $oFilter->GetClass())
{
$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
$oExisting->MergeWith_InNamespace($oFilter, $aClassAliases, $aAliasTranslation);
$bMerged = true;
break;
}
@@ -977,7 +977,7 @@ class DBObjectSearch extends DBSearch
{
if ($oExisting->GetClass() == $oFilter->GetClass())
{
$oExisting->MergeWith_InNamespace($oFilter, $oExisting->m_aClasses, $aAliasTranslation);
$oExisting->MergeWith_InNamespace($oFilter, $aClassAliases, $aAliasTranslation);
$bMerged = true;
break;
}