diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:49:56 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 13:49:56 +0100 |
| commit | 87230286b2948cf580e21f426824a974210d7595 (patch) | |
| tree | 3f0098f4f8b65ff61d60a333351d847387670596 /system/database/DB_active_rec.php | |
| parent | 5e18e891a14400a96f9b4af36925457b79b62005 (diff) | |
| parent | 6ea625e7f31b65838f1829408d37ac26009c79bc (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) { |