diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-02 16:17:29 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-02 16:17:29 +0200 |
| commit | 9e0be2ba2179a93200d16a72c74e2ac61f9a71d4 (patch) | |
| tree | 69a0b447980c260ee40d53714ad58036ada8da1a /system/database | |
| parent | b75faa1a03a32330e412f0bd0332fb9fa389e914 (diff) | |
| parent | ee04a913dfd78d394a0e09f01655df0870369512 (diff) | |
Merge upstream
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_query_builder.php | 2 |
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) { |