From 16baa35ad4175f8c14a0056ea9efc4785f84b03e Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Thu, 2 Sep 2010 11:21:38 +0000 Subject: [PATCH] - Fixed a regression introduced by revision [737] SVN:trunk[744] --- application/cmdbabstract.class.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index 574840b8f..3e47fdc3b 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -382,7 +382,7 @@ abstract class cmdbAbstractObject extends CMDBObject $sClassName = $oSet->GetFilter()->GetClass(); $aAttribs = array(); $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); if (!empty($sLinkageAttribute)) { @@ -390,6 +390,7 @@ abstract class cmdbAbstractObject extends CMDBObject // and other objects... // 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 | + $aDisplayList = array(); $aAttDefs = MetaModel::ListAttributeDefs($sClassName); assert(isset($aAttDefs[$sLinkageAttribute])); $oAttDef = $aAttDefs[$sLinkageAttribute];