From 19850b5e0d2393626d83ec3f80db3198f75e9007 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Fri, 16 Apr 2021 15:55:50 +0000
Subject: [PATCH] [DB] Fix bug in custom criteria format wrangling

---
 src/Core/DB/DB.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Core/DB/DB.php b/src/Core/DB/DB.php
index 32b3df2889..c21f6fe495 100644
--- a/src/Core/DB/DB.php
+++ b/src/Core/DB/DB.php
@@ -113,7 +113,12 @@ abstract class DB
         foreach ($criteria as $op => $exp) {
             if ($op == 'or' || $op == 'and') {
                 $method = "{$op}X";
-                return $eb->{$method}(...self::buildExpression($eb, $exp));
+                $expr   = self::buildExpression($eb, $exp);
+                if (is_array($expr)) {
+                    return $eb->{$method}(...$expr);
+                } else {
+                    return $eb->{$method}($expr);
+                }
             } elseif ($op == 'is_null') {
                 $expressions[] = $eb->isNull($exp);
             } else {