diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-27 21:28:29 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-05-27 21:28:29 +0200 |
| commit | 044809b12475da3ff03e8e7113dd7f443e101481 (patch) | |
| tree | 4536dccc7ac732133ba352f950709a5b382ceef8 /system | |
| parent | da33cb5df443c41dce75cdf756ea4c3234b510fb (diff) | |
| parent | 9b655400c9519407d1d33a75323b9f4fdac42766 (diff) | |
Merge branch '2.1-stable' of github.com:EllisLab/CodeIgniter into 2.1-stable
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index c25752824..858ec356d 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1272,7 +1272,7 @@ class CI_DB_driver { $item = $matches[1]; // Escape the alias - $alias = ' '.$matches[2].$this->escape_identifiers($matches[3]); + $alias = ' '.$matches[2].$this->_escape_identifiers($matches[3]); } else { |