diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:23:10 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:23:10 +0100 |
| commit | fd70ceb017b13db3faf54fa43df850c1b82abedb (patch) | |
| tree | 55c547a55b349e83db32a357a48040769027fd32 /system/database/DB_active_rec.php | |
| parent | 5f2214f0526b823c92f308312d883147a4c9faed (diff) | |
| parent | 55201acd0692f02eb5927f412db73b925b6ba738 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/DB_active_rec.php')
| -rw-r--r-- | system/database/DB_active_rec.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index de8cfc1ca..35164a79c 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -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) { |