diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:40:56 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 14:40:56 +0100 |
| commit | 84a3b25b11da0f5b69c9a128cd79b98bfb70dc30 (patch) | |
| tree | a5fd16fe0ae7b0ab3e8ee9a56683da7c3cc7225a /system/database/DB_active_rec.php | |
| parent | 75124a53cf54f2a8c094756f9189be9159957f28 (diff) | |
| parent | 820999cb0d82c80d6dc5dde133568812c8113e29 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-helpers-sst
Diffstat (limited to 'system/database/DB_active_rec.php')
| -rw-r--r-- | system/database/DB_active_rec.php | 1 |
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) { |