diff options
| author | Greg Aker <greg@gregaker.net> | 2011-08-21 21:44:20 +0200 |
|---|---|---|
| committer | Greg Aker <greg@gregaker.net> | 2011-08-21 21:44:20 +0200 |
| commit | bf53a06961bd1ccc0f46a1e3d19c05da48fb2cad (patch) | |
| tree | 2b8717e3bfa3bd1961e95375b66d605d3d2fb2cc /system | |
| parent | 151b7a9abed49e76232ad195cc2c010bfc82f22a (diff) | |
| parent | 5137766f2b59daa2d5f99eda0833a950ab2eaf61 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_active_rec.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php index 841ede28e..37d162bc1 100644 --- a/system/database/DB_active_rec.php +++ b/system/database/DB_active_rec.php @@ -196,7 +196,7 @@ class CI_DB_active_record extends CI_DB_driver { $alias = $this->_create_alias_from_table(trim($select)); } - $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$alias; + $sql = $type.'('.$this->_protect_identifiers(trim($select)).') AS '.$this->_protect_identifiers(trim($alias)); $this->ar_select[] = $sql; |