#932: fixed a regression introduced by [r3319]... in case a criteria is present several times.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3344 a333f486-631f-4898-b8df-5754b55c2be0

core/dbobjectset.class.php

@@ -1098,8 +1098,11 @@ class DBObjectSet
 		{
 			foreach($aVals as $sCode => $oExpr)
 			{
-				$oScalarExpr = $oExpr->GetAsScalar($aScalarArgs);
-				$aConst[$sClassAlias][$sCode] = $oScalarExpr->GetValue();
+				if (is_object($oExpr)) // Array_merge_recursive creates an array when the same key is present multiple times... ignore them
+				{
+					$oScalarExpr = $oExpr->GetAsScalar($aScalarArgs);
+					$aConst[$sClassAlias][$sCode] = $oScalarExpr->GetValue();
+				}
 			}
 		}
 		return $aConst;		

core/expression.class.inc.php

@@ -299,13 +299,8 @@ class BinaryExpression extends Expression
 			{
 				$aResult[$this->m_oRightExpr->GetParent()][$this->m_oRightExpr->GetName()] = $this->m_oLeftExpr;
 			}
-			else
-			{
-				// Strictly, this should be removed
-				$aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields());
-			}
 		}
-		else
+		else if ($this->m_sOperator == 'AND')
 		{
 			// Strictly, this should be done only for the AND operator
 			$aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields());