| commit | 7c4870c3741e165bc7bc06624c816e66db474ee2 | [log] [tgz] |
|---|---|---|
| author | Joel Kallman <jkallman@eclarian.com> | Mon Mar 12 18:10:44 2012 -0400 |
| committer | Joel Kallman <jkallman@eclarian.com> | Mon Mar 12 18:10:44 2012 -0400 |
| tree | a96962212cb012be32ab09545dcd5c4dbdac05e2 | |
| parent | 10aa8e660c6f439958b79fce5d85ce7e8eecf028 [diff] | |
| parent | 6b535f51fcb94e0a645fda0d0356f4748076877e [diff] |
Merge branch 'develop' into feature/db_toString_support
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 12cd391..bcff433 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php
@@ -670,7 +670,7 @@ */ public function escape($str) { - if (is_string($str)) + if (is_string($str) OR method_exists($str, '__toString')) { $str = "'".$this->escape_str($str)."'"; }