summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-05-02 11:47:42 +0200
committerAndrey Andreev <narf@bofh.bg>2012-05-02 11:47:42 +0200
commitbd738c80a623700b3b11e876abb764ca6d57769d (patch)
tree7ceec96d9dc36bb524acff0946e9eb0db03f90d0 /system/database
parent721c77fcf347751895623514fb2e4c89390afa67 (diff)
parent02b80cbe5aae7e474b097c149ab6479de9ab0f91 (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-odbc
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_query_builder.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index 393a1cd75..d0af66de1 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -281,7 +281,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
$v = trim($v);
$this->_track_aliases($v);
- $v = $this->qb_from[] = $this->protect_identifiers($v, TRUE, NULL, FALSE);
+ $this->qb_from[] = $v = $this->protect_identifiers($v, TRUE, NULL, FALSE);
if ($this->qb_caching === TRUE)
{