[update] always update system property on nested conditions

atk4 · Aug 8, 2020 · 1b9f276 · 1b9f276
1 parent 21827e5
commit 1b9f276
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Model/Scope.php b/src/Model/Scope.php
@@ -77,10 +77,8 @@ public function addCondition($field, $operator = null, $value = null)
 
     protected function setSystem($system = true)
     {
-        if ($this->isAnd()) {
-            foreach ($this->elements as $nestedCondition) {
-                $nestedCondition->setSystem($system);
-            }
+        foreach ($this->elements as $nestedCondition) {
+            $nestedCondition->setSystem($system && $this->isAnd());
         }
 
         return $this;