From b5793b212988a5376b33fffb4e3029c65144f3a2 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Mon, 15 Sep 2014 13:51:54 +0000 Subject: [PATCH] #932 Search form should be prefilled when running a search "shortcut" - very little progress: fixed the case when several criteria are given SVN:2.0.2[3328] --- core/expression.class.inc.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/expression.class.inc.php b/core/expression.class.inc.php index 4d1b1fb7f..76c75783f 100644 --- a/core/expression.class.inc.php +++ b/core/expression.class.inc.php @@ -301,12 +301,14 @@ class BinaryExpression extends Expression } else { - $aResult = array_merge($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()) ; + // Strictly, this should be removed + $aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()); } } else { - $aResult = array_merge($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()) ; + // Strictly, this should be done only for the AND operator + $aResult = array_merge_recursive($this->m_oRightExpr->ListConstantFields(), $this->m_oLeftExpr->ListConstantFields()); } return $aResult; }