Adding Support to Properly Escape Objects that have __toString() magic method so that the object can be passed directly as a parameter in a condition without having to manually convert to a string

Signed-off-by: Joel Kallman <jkallman@eclarian.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 9d92f2f87..a72bf3101 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -727,7 +727,7 @@ class CI_DB_driver {
 	 */
 	function escape($str)
 	{
-		if (is_string($str))
+		if (is_string($str) OR method_exists($str, '__toString'))
 		{
 			$str = "'".$this->escape_str($str)."'";
 		}