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

(Retrofit from trunk) N.536 Regression introduced in [r4469] (N.505), itself fixing a regression introduced in [r4404]. REQUIRES TESTING

Browse Source 
SVN:2.3[4489]
This commit is contained in:
Romain Quetiez
2016-12-02 20:43:17 +00:00
parent 44d3fb2738
commit b2f42ae3f4
2 changed files with 278 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/dbobjectsearch.class.php
View File

@@ -1426,6 +1426,7 @@ class DBObjectSearch extends DBSearch
}
}
$sRawId .= $bGetCount;
$sRawId .= implode(',', $aSelectedClasses); // Unions may alter the list of selected columns
$sOqlId = md5($sRawId);
}
else
@@ -1476,7 +1477,7 @@ class DBObjectSearch extends DBSearch
if (!isset($oSQLQuery))
{
$oKPI = new ExecutionKPI();
$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr);
$oSQLQuery = $oSearch->BuildSQLQueryStruct($aAttToLoad, $bGetCount, $aModifierProperties, $aGroupByExpr, $aSelectedClasses);
$oKPI->ComputeStats('BuildSQLQueryStruct', $sOqlQuery);
if (self::$m_bQueryCacheEnabled)