Fix logic

sclubricants · sclubricants · commit 87af5f8eb9d9 · 2022-08-22T17:00:18.000-07:00
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -2698,7 +2698,7 @@ protected function objectToArray($object)
 
         foreach (get_object_vars($object) as $key => $val) {
             // There are some built in keys we need to ignore for this conversion
-            if ((! is_object($val) && ! is_array($val) && $key !== '_parent_name') || is_a($val, RawSql::class)) {
+            if (((! is_object($val) || $val instanceof RawSql) && ! is_array($val) && $key !== '_parent_name')) {
                 $array[$key] = $val;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2698,7 +2698,7 @@ protected function objectToArray($object)`
`2698`	`2698`
`2699`	`2699`	`foreach (get_object_vars($object) as $key => $val) {`
`2700`	`2700`	`// There are some built in keys we need to ignore for this conversion`
`2701`		`- if ((! is_object($val) && ! is_array($val) && $key !== '_parent_name') \|\| is_a($val, RawSql::class)) {`
	`2701`	`+ if (((! is_object($val) \|\| $val instanceof RawSql) && ! is_array($val) && $key !== '_parent_name')) {`
`2702`	`2702`	`$array[$key] = $val;`
`2703`	`2703`	`}`
`2704`	`2704`	`}`