diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index e1abd4724..dc6d31b89 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -678,7 +678,8 @@ EOF foreach($aNotificationClasses as $sNotifClass) { $aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev JOIN Trigger AS T ON Ev.trigger_id = T.id WHERE T.id IN (:triggers) AND Ev.object_id = :id"); - $oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], array(), $aParams); + $aNotifSearches[$sNotifClass]->SetInternalParams($aParams); + $oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], array()); $iNotifsCount += $oNotifSet->Count(); } // Display notifications regarding the object: on block per subclass to have the intersting columns diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 2ae59862f..2ec9e66e8 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -249,7 +249,7 @@ class DisplayBlock $sHtml .= $this->GetRenderContent($oPage, $aExtraParams, $sId); } catch (Exception $e) { - + IssueLog::Error('Exception during GetDisplay: ' . $e->getMessage()); } $sHtml .= "\n"; } diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php index c94b32c1f..aa8a97deb 100644 --- a/core/oql/expression.class.inc.php +++ b/core/oql/expression.class.inc.php @@ -1536,7 +1536,19 @@ class VariableExpression extends UnaryExpression $oRet = null; if (array_key_exists($this->m_sName, $aArgs)) { - $oRet = new ScalarExpression($aArgs[$this->m_sName]); + if(is_array($aArgs[$this->m_sName])) + { + $aExpressions = array(); + foreach($aArgs[$this->m_sName] as $sValue) + { + $aExpressions[] = new ScalarExpression($sValue); + } + $oRet = new ListExpression($aExpressions); + } + else + { + $oRet = new ScalarExpression($aArgs[$this->m_sName]); + } } elseif (($iPos = strpos($this->m_sName, '->')) !== false) {