Selaa lähdekoodia

- Fixed a regression introduced by revision [737]

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@744 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 14 vuotta sitten
vanhempi
commit
faceed5497
1 muutettua tiedostoa jossa 2 lisäystä ja 1 poistoa
  1. 2 1
      application/cmdbabstract.class.inc.php

+ 2 - 1
application/cmdbabstract.class.inc.php

@@ -382,7 +382,7 @@ abstract class cmdbAbstractObject extends CMDBObject
 		$sClassName = $oSet->GetFilter()->GetClass();
 		$sClassName = $oSet->GetFilter()->GetClass();
 		$aAttribs = array();
 		$aAttribs = array();
 		$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
 		$sZListName = isset($aExtraParams['zlist']) ? ($aExtraParams['zlist']) : 'list';
-		$aList = self::FlattenZList(MetaModel::GetZListItems($sClassName, '$sZListName'));
+		$aList = self::FlattenZList(MetaModel::GetZListItems($sClassName, $sZListName));
 		$aList = array_merge($aList, $aExtraFields);
 		$aList = array_merge($aList, $aExtraFields);
 		if (!empty($sLinkageAttribute))
 		if (!empty($sLinkageAttribute))
 		{
 		{
@@ -390,6 +390,7 @@ abstract class cmdbAbstractObject extends CMDBObject
 			// and other objects...
 			// and other objects...
 			// The display will then group all the attributes related to the link itself:
 			// The display will then group all the attributes related to the link itself:
 			// | Link_attr1 | link_attr2 | ... || Object_attr1 | Object_attr2 | Object_attr3 | .. | Object_attr_n |
 			// | Link_attr1 | link_attr2 | ... || Object_attr1 | Object_attr2 | Object_attr3 | .. | Object_attr_n |
+			$aDisplayList = array();
 			$aAttDefs = MetaModel::ListAttributeDefs($sClassName);
 			$aAttDefs = MetaModel::ListAttributeDefs($sClassName);
 			assert(isset($aAttDefs[$sLinkageAttribute]));
 			assert(isset($aAttDefs[$sLinkageAttribute]));
 			$oAttDef = $aAttDefs[$sLinkageAttribute];
 			$oAttDef = $aAttDefs[$sLinkageAttribute];