diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-02-07 14:35:51 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-02-07 14:35:51 +0100 |
| commit | ff6d1a80b75eb4303551be1f2708509757a85e50 (patch) | |
| tree | c84c6a397341c462f02aa236d2c406944ff20386 /system/database/DB_query_builder.php | |
| parent | 664b83e1d023e067d3b9bc75dbe96161236fd5f7 (diff) | |
| parent | c697a3bfdfc301718058a09fd5692fbecee6920a (diff) | |
Merge branch 'develop' into 'feature/user-guide-cleanup'
Diffstat (limited to 'system/database/DB_query_builder.php')
| -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) |