summaryrefslogtreecommitdiffstats
path: root/system/database/DB_query_builder.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-03-04 14:19:43 +0100
committerAndrey Andreev <narf@devilix.net>2016-03-04 14:19:43 +0100
commita0de5a1954ded76ed0bfa9718a332b1578fabdab (patch)
tree8c16aedf6d6d9a605a94d2f601295dc6ebe7a4af /system/database/DB_query_builder.php
parente3af21d31a828c195b8bfa4b1aec9ecd052b53ce (diff)
parent8f06abf0e533a04663a7a11bbc60bee3ffb24f0a (diff)
Merge branch 'develop' of github.com:bcit-ci/CodeIgniter into develop
Diffstat (limited to 'system/database/DB_query_builder.php')
-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 d6f35e0df..eb9620f16 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -2342,7 +2342,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
*
* Escapes identifiers in WHERE and HAVING statements at execution time.
*
- * Required so that aliases are tracked properly, regardless of wether
+ * Required so that aliases are tracked properly, regardless of whether
* where(), or_where(), having(), or_having are called prior to from(),
* join() and dbprefix is added only if needed.
*