diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-07 14:21:43 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-07 14:21:43 +0100 |
| commit | f6600f840125eadf2366c2244f78ad95defb156b (patch) | |
| tree | de10a75d901530daf719a2f503de4fc59f8bd0ed /system/database | |
| parent | 81e10644861c86437cf197b54af096894b41cd63 (diff) | |
| parent | c697a3bfdfc301718058a09fd5692fbecee6920a (diff) | |
Merge branch 'develop' into feature/encryption
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 8223baac1..ef690090f 100644 --- a/system/database/DB_query_builder.php +++ b/system/database/DB_query_builder.php @@ -263,7 +263,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver { $select = explode(',', $select); } - // If the escape value was not set will will base it on the global setting + // If the escape value was not set, we will base it on the global setting is_bool($escape) OR $escape = $this->_protect_identifiers; foreach ($select as $val) |