浏览代码

#187 Warning issued while computing the impact

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@616 a333f486-631f-4898-b8df-5754b55c2be0
romainq 15 年之前
父节点
当前提交
a8ba326152
共有 1 个文件被更改,包括 11 次插入2 次删除
  1. 11 2
      core/dbobjectset.class.php

+ 11 - 2
core/dbobjectset.class.php

@@ -369,8 +369,17 @@ class DBObjectSet
 		$this->Seek(0);
 		while ($oObject = $this->Fetch())
 		{
-			// #@# todo - actually merge !
-			$aRelatedObjs = array_merge_recursive($aRelatedObjs, $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited));
+			$aMore = $oObject->GetRelatedObjects($sRelCode, $iMaxDepth, $aVisited);
+			foreach ($aMore as $sClass => $aRelated)
+			{
+				foreach ($aRelated as $iObj => $oObj)
+				{
+					if (!isset($aRelatedObjs[$sClass][$iObj]))
+					{
+						$aRelatedObjs[$sClass][$iObj] = $oObj;
+					}
+				}
+			}
 		}
 		return $aRelatedObjs;
 	}