From 70e0fab2679475cfae636d676ff930f77613dc00 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Wed, 30 Mar 2016 12:11:57 +0000 Subject: [PATCH] Fixed regression introduced with [3912] and partially fixed in [3954] : when the autocomplete is active, then the search dialog was not working anymore. SVN:trunk[3972] --- core/dbobjectset.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/dbobjectset.class.php b/core/dbobjectset.class.php index da8d90c46..047a4ac53 100644 --- a/core/dbobjectset.class.php +++ b/core/dbobjectset.class.php @@ -1072,7 +1072,8 @@ class DBObjectSet */ public function ListConstantFields() { - $aScalarArgs = array_merge($this->m_oFilter->GetInternalParams(), $this->m_aArgs); + // The complete list of arguments will include magic arguments (e.g. current_user->attcode) + $aScalarArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs); $aConst = $this->m_oFilter->ListConstantFields(); foreach($aConst as $sClassAlias => $aVals) @@ -1091,7 +1092,7 @@ class DBObjectSet public function ApplyParameters() { - $aAllArgs = array_merge($this->m_aArgs, $this->m_oFilter->GetInternalParams()); + $aAllArgs = MetaModel::PrepareQueryArguments($this->m_oFilter->GetInternalParams(), $this->m_aArgs); $this->m_oFilter->ApplyParameters($aAllArgs); } }