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

Internal: query arguments could be array values, making it easier to build dynamic IN() clauses

Browse Source 
SVN:trunk[4006]
This commit is contained in:
Romain Quetiez
2016-04-19 13:59:43 +00:00
parent 0386c53a6a
commit 2a835e5be4
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/metamodel.class.php
View File

@@ -2488,7 +2488,10 @@ abstract class MetaModel
{
$aScalarArgs[$sArgName] = null;
}
// otherwise... could be an array coming from the extra params...
elseif (is_array($value))
{
$aScalarArgs[$sArgName] = $value;
}
}
}
// Add standard magic arguments

7
core/oql/expression.class.inc.php
View File

@@ -648,7 +648,12 @@ class VariableExpression extends UnaryExpression
}
elseif (array_key_exists($this->m_sName, $aArgs))
{
return CMDBSource::Quote($aArgs[$this->m_sName]);
$res = CMDBSource::Quote($aArgs[$this->m_sName]);
if (is_array($res))
{
$res = implode(', ', $res);
}
return $res;
}
elseif (($iPos = strpos($this->m_sName, '->')) !== false)
{