diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-05-06 18:38:04 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-05-06 18:38:04 +0200 |
| commit | bd4c87543818bd4573308743d44e12b78349ecd0 (patch) | |
| tree | 8afedb90cf13a1a65f89de70dbb4f0c26d4ccf05 /system/database | |
| parent | 02958b5b78835a484c1038d77f4bcfc5ae273a2d (diff) | |
| parent | 827f3de2733e85ede6311feb2e4bf73ecf209eb3 (diff) | |
merging in changes
Diffstat (limited to 'system/database')
| -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 508f6bedf..83d481699 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -204,6 +204,7 @@ class CI_DB_active_record extends CI_DB_driver { $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias; $this->ar_select[] = $sql; + $this->ar_no_escape[] = NULL; if ($this->ar_caching === TRUE) { |