summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-11-06 10:53:45 +0100
committerAndrey Andreev <narf@bofh.bg>2012-11-06 10:53:45 +0100
commita7ddd2d48ec30f10250b045dbec651fc0e07532e (patch)
tree2b345e2c83cc98529cc37a150876e55594130274 /system
parent7ec4480f5489aaef10f761223b404cb29021fc49 (diff)
Fix an escape_identifiers() bug
Diffstat (limited to 'system')
-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 39db16150..dfaf0e0c1 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1236,7 +1236,7 @@ abstract class CI_DB_driver {
*/
public function escape_identifiers($item)
{
- if ($this->_escape_char === '' OR empty($item))
+ if ($this->_escape_char === '' OR empty($item) OR in_array($item, $this->_reserved_identifiers))
{
return $item;
}