summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-06 10:20:45 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-06 10:20:45 +0100
commit0c0a88cafcdce2cb9c9b02f988ab1aae59a43729 (patch)
treec5770080ac901bb0b980a8291fa623620d911892 /system
parent3aa781a65267d72000009df0fa2feee5cb3bdd8d (diff)
parent33578d209c8cc8a8bce5ccc6f289b6ada9d03adb (diff)
Merge pull request #2857 from vivekdinesh/typo-fix
Typo Fix
Diffstat (limited to 'system')
-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 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)