summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-07-24 11:29:14 +0200
committerAndrey Andreev <narf@devilix.net>2015-07-24 11:29:14 +0200
commit6d7f87a9b2ce2950e568162e21c96af4c201147a (patch)
tree7daf6ccc5dd522cbb58ae8a2846eb4d749a711bf /system/database
parentab494d564262f9ad30dc2f57a78b8aceee5e657d (diff)
parent55bc50578b9f1aa3fd71cb427848b21748655690 (diff)
Merge pull request #3996 from calvintam236/develop
[ci skip] Fix some docblock typos
Diffstat (limited to 'system/database')
-rw-r--r--system/database/DB_forge.php2
-rw-r--r--system/database/DB_query_builder.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index 865498fb5..dde285598 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -143,7 +143,7 @@ abstract class CI_DB_forge {
protected $_unsigned = TRUE;
/**
- * NULL value representatin in CREATE/ALTER TABLE statements
+ * NULL value representation in CREATE/ALTER TABLE statements
*
* @var string
*/
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index e53fb5478..0bb91bae9 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1290,7 +1290,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Compiles a SELECT query string and returns the sql.
*
* @param string the table name to select from (optional)
- * @param bool TRUE: resets QB values; FALSE: leave QB vaules alone
+ * @param bool TRUE: resets QB values; FALSE: leave QB values alone
* @return string
*/
public function get_compiled_select($table = '', $reset = TRUE)