fix

sclubricants · sclubricants · commit 90c934992e93 · 2022-08-02T14:44:00.000-07:00
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -1238,7 +1238,7 @@ public function escape($str)
         }
 
         if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
-            if (is_object($str) && get_class($str) === RawSql::class) {
+            if (is_object($str) && basename(strtr(get_class($str), "\\", "/")) === basename(strtr(RawSql::class, "\\", "/"))) {
                 return $str->__toString();
             }
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -182,7 +182,7 @@ public function escape($str)
         }
 
         if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
-            if (is_object($str) && get_class($str) === RawSql::class) {
+            if (is_object($str) && basename(strtr(get_class($str), "\\", "/")) === basename(strtr(RawSql::class, "\\", "/"))) {
                 return $str->__toString();
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1238,7 +1238,7 @@ public function escape($str)`
`1238`	`1238`	`}`
`1239`	`1239`
`1240`	`1240`	`if (is_string($str) \|\| (is_object($str) && method_exists($str, '__toString'))) {`
`1241`		`- if (is_object($str) && get_class($str) === RawSql::class) {`
	`1241`	`+ if (is_object($str) && basename(strtr(get_class($str), "\\", "/")) === basename(strtr(RawSql::class, "\\", "/"))) {`
`1242`	`1242`	`return $str->__toString();`
`1243`	`1243`	`}`
`1244`	`1244`
Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public function escape($str)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (is_string($str) \|\| (is_object($str) && method_exists($str, '__toString'))) {`
`185`		`- if (is_object($str) && get_class($str) === RawSql::class) {`
	`185`	`+ if (is_object($str) && basename(strtr(get_class($str), "\\", "/")) === basename(strtr(RawSql::class, "\\", "/"))) {`
`186`	`186`	`return $str->__toString();`
`187`	`187`	`}`
`188`	`188`