summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-13 12:07:58 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-13 12:07:58 +0200
commit9859cb032ab5b702bd91d4aafbf5119c0f7d200a (patch)
treebac338797173b1f4fcb1e5dc0a2ef21b2be5d7ca
parent6b114ae363eb94328b9d367492ae1b555a19a26c (diff)
escape_identifiers() to not escape string literals inside double quotes as well
-rw-r--r--system/database/DB_driver.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index e9efc8914..d63a1d955 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -985,7 +985,7 @@ abstract class CI_DB_driver {
return $item;
}
// Avoid breaking functions and literal values inside queries
- elseif (ctype_digit($item) OR $item[0] === "'" OR strpos($item, '(') !== FALSE)
+ elseif (ctype_digit($item) OR $item[0] === "'" OR ($this->_escape_char !== '"' && $item[0] === '"') OR strpos($item, '(') !== FALSE)
{
return $item;
}