From 311aeb0b07e1b75a4b930e383d8a476b318922f6 Mon Sep 17 00:00:00 2001 From: acognet Date: Wed, 24 Jun 2020 12:09:55 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02589=20-=20Infinite=20loops=20when=20log?= =?UTF-8?q?ging=20with=20a=20Contact=20having=20a=20non=20empty=20TagSet?= =?UTF-8?q?=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/oql/expression.class.inc.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/core/oql/expression.class.inc.php b/core/oql/expression.class.inc.php index 28b456c0a..5bce60fb8 100644 --- a/core/oql/expression.class.inc.php +++ b/core/oql/expression.class.inc.php @@ -2180,7 +2180,7 @@ class NestedQueryExpression extends Expression public function ListParameters() { - return array(); + return $this->m_oNestedQuery->ListParameters(); } public function RenameParam($sOldName, $sNewName) @@ -2332,7 +2332,13 @@ class FunctionExpression extends Expression public function ListParameters() { - return array(); + + $aRes = array(); + foreach ($this->m_aArgs as $oExpr) + { + $aRes = array_merge($aRes, $oExpr->ListParameters()); + } + return $aRes; } public function RenameParam($sOldName, $sNewName) @@ -2769,7 +2775,12 @@ class CharConcatExpression extends Expression public function ListParameters() { - return array(); + $aRes = array(); + foreach ($this->m_aExpressions as $oExpr) + { + $aRes = array_merge($aRes, $oExpr->ListParameters()); + } + return $aRes; } public function RenameParam($sOldName, $sNewName)