diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-21 20:50:51 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-08-21 20:50:51 +0200 |
| commit | f45ea72f1105f3e30002d60c2cf8db8c11b9a9f1 (patch) | |
| tree | e3c8cbc689fa762330704c585f1cdd6be90b1947 /system | |
| parent | b30f4fbdaa721101b7cc92f535bfe05b81e6b49c (diff) | |
| parent | fa2c3b57ba60558c4793dec373dd2ddbd4fba1da (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into feature/unit-tests
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 d76f57157..4b159b031 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; $this->ar_no_escape[] = NULL; |