summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:46:34 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2012-03-14 11:46:34 +0100
commit0fe8c8e21315e00dbc06a87290fb268a2dc999a9 (patch)
tree4bc75acb95f49de7bf5df9ec3eb684bc39c93ad0 /system/database
parentca6404749a8dd3ee5dd68d64832374dce05fe6a3 (diff)
parent62c0647d241d556590d470ea27ac9aa36f609bfa (diff)
Merge branch 'feature/unit-tests' into develop
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_active_rec.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index 756709698..35164a79c 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -214,6 +214,7 @@ class CI_DB_active_record extends CI_DB_driver {
$sql = $this->protect_identifiers($type.'('.trim($select).')').' AS '.$this->protect_identifiers(trim($alias));
$this->ar_select[] = $sql;
+ $this->ar_no_escape[] = NULL;
if ($this->ar_caching === TRUE)
{