diff options
| author | Timothy Warren <tim@timshomepage.net> | 2011-10-03 16:05:42 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2011-10-03 16:05:42 +0200 |
| commit | 3fdb613ee7c1968435edb81dcb9a59f42be6de6e (patch) | |
| tree | deb8ebc7a7ea1dabcdbfc284bae2f300d7d6a902 /system/database | |
| parent | a0cd41c5187c738d043ca5a0dc5fbf80806fd322 (diff) | |
| parent | 51a7b75ba023a4bf1e70840a19e0457f5123fb72 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/database')
| -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 7162e2ac5..83518232e 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 '.$this->_protect_identifiers(trim($alias)); + $sql = $this->_protect_identifiers($type.'('.trim($select).')').' AS '.$this->_protect_identifiers(trim($alias)); $this->ar_select[] = $sql; |