composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

#932 Search form should be prefilled when running a search "shortcut" - very little progress: fixed the case when several criteria are given -reintegrated from trunk

Browse Source 
SVN:2.0.3[3327]
This commit is contained in:
Romain Quetiez
2014-09-15 13:51:36 +00:00
parent 3c4057d546
commit 5e600c88a7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/expression.class.inc.php
View File

@@ -301,12 +301,14 @@ class BinaryExpression extends Expression
} }
else 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 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; return $aResult;
} }