| commit | 3a5efc291ac17a8a9886be25f6b430796969d154 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@bofh.bg> | Tue Nov 20 21:18:08 2012 +0200 |
| committer | Andrey Andreev <narf@bofh.bg> | Tue Nov 20 21:18:08 2012 +0200 |
| tree | fd1489bf5117bf2d8b08c0f6ee2282e9ad869e9d | |
| parent | d337a2621d36aebd0747b4e10a61b98bb13a2793 [diff] [blame] |
Fix issue #2015
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 65ff792..9fcea39 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php
@@ -985,7 +985,7 @@ */ public function escape($str) { - if (is_string($str) OR method_exists($str, '__toString')) + if (is_string($str) OR (is_object($str) && method_exists($str, '__toString'))) { return "'".$this->escape_str($str)."'"; }