Merge branch 'develop'

This commit is contained in:
2020-07-24 12:06:16 -04:00

View File

@ -79,10 +79,10 @@ class Model {
} }
foreach ($conditions as $c) { foreach ($conditions as $c) {
$cond = (object) [ $cond = (object) [
'column' => $j['column'] ?? $j[0], 'column' => $c['column'] ?? $c[0],
'value' => $j['value'] ?? $j[1], 'value' => $c['value'] ?? $c[1],
'sym' => strtolower($j['sym'] ?? ($j[2] ?? '=')), 'sym' => strtolower($c['sym'] ?? ($c[2] ?? '=')),
'type' => strtolower($j['type']) ?? '' 'type' => strtolower($c['type']) ?? ''
]; ];
$this->conditions []= $cond; $this->conditions []= $cond;
} }