diff options
| author | Michael Dennis <michaeljdennis@gmail.com> | 2011-08-29 19:06:59 +0200 |
|---|---|---|
| committer | Michael Dennis <michaeljdennis@gmail.com> | 2011-08-29 19:06:59 +0200 |
| commit | 013f78dc6a878d7775aa2bbcef573934a6d88a72 (patch) | |
| tree | 97ba05fd8e5efc066cb8f428744991fc628d207b /system/database/DB_active_rec.php | |
| parent | cb07a322bee5c5b0a551ab959c7475a1a702ad03 (diff) | |
| parent | 70e61b5dc0b240c4a3341ca65ad9f2f5254df1b5 (diff) | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'system/database/DB_active_rec.php')
| -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; |