From 78f6ed1ef6b3657d6ea8b080e8800ccc30302257 Mon Sep 17 00:00:00 2001 From: James Collins Date: Sat, 3 Jun 2023 18:38:12 +1000 Subject: [PATCH] allow : in filter values --- app/Conductors/Conductor.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Conductors/Conductor.php b/app/Conductors/Conductor.php index a887543..2b3b3d5 100644 --- a/app/Conductors/Conductor.php +++ b/app/Conductors/Conductor.php @@ -753,6 +753,7 @@ class Conductor * @param string $rawFilter The raw filter string to parse. * @param array|null $limitFields The fields to allow in the filter string. * @param string $outerJoin The join for this filter group. + * @return void */ final public function appendFilterString(string $rawFilter, array|null $limitFields = null, string $outerJoin = 'OR'): void { @@ -792,8 +793,10 @@ class Conductor $field = substr($field, 1, -1); } - $set = &$value; - continue; + if ($set !== $value) { + $set = &$value; + continue; + } } elseif (($char === ')' && $string[($i + 1)] === ',') || $char === ',') { if ($value === null) { $tokens[] = $field; @@ -852,6 +855,7 @@ class Conductor $i = 0; $filterArray = $parseFunc($rawFilter, $i); + print_r($filterArray); if (count($this->filterArray) !== 0) { $this->filterArray[] = $outerJoin;