diff options
| author | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
|---|---|---|
| committer | ftwbzhao <b.zhao1@gmail.com> | 2015-04-09 16:32:41 +0200 |
| commit | b587698dd45396b91106bd7c894a79747b1fb7a9 (patch) | |
| tree | 76a1d614976dd0b695e513a40f9235e3b9f7f82c /system/database | |
| parent | 9b9a06c9635cd3b4fce0aebe4d2eead4809999a5 (diff) | |
| parent | fd363f224d7886eb686434d7a835eaa49183d8e6 (diff) | |
Merge branch 'develop' of https://github.com/bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system/database')
| -rw-r--r-- | system/database/DB_query_builder.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php index e5ffef2bb..8251f4558 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -918,6 +918,8 @@ abstract class CI_DB_query_builder extends CI_DB_driver { } is_bool($escape) OR $escape = $this->_protect_identifiers; + // lowercase $side in case somebody writes e.g. 'BEFORE' instead of 'before' (doh) + $side = strtolower($side); foreach ($field as $k => $v) { @@ -2253,7 +2255,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { else { // Cycle through the "select" portion of the query and prep each column name. - // The reason we protect identifiers here rather then in the select() function + // The reason we protect identifiers here rather than in the select() function // is because until the user calls the from() function we don't know if there are aliases foreach ($this->qb_select as $key => $val) { |