summaryrefslogtreecommitdiffstats
path: root/system/database/DB_driver.php
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-21 21:08:17 +0200
committeradmin <devnull@localhost>2006-10-21 21:08:17 +0200
commitfafe28bec4f414e48f63e01ed9105ae5c2c99802 (patch)
treeb3e3f01cb1af83a29aff421aa308cb85788bbbe1 /system/database/DB_driver.php
parente7e1dcd452a15abaaa01c03cd1ade564e3a59453 (diff)
Diffstat (limited to 'system/database/DB_driver.php')
-rw-r--r--system/database/DB_driver.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index a24bd20d8..8a7b88f18 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -368,7 +368,7 @@ class CI_DB_driver {
/**
* Simple Query
- * This is a simiplified version of the query() function. Internally
+ * This is a simplified version of the query() function. Internally
* we only use it when running transaction commands since they do
* not require all the features of the main query() function.
*
@@ -535,7 +535,7 @@ class CI_DB_driver {
* Calculate the aggregate query elapsed time
*
* @access public
- * @param intiger The number of decimal places
+ * @param integer The number of decimal places
* @return integer
*/
function elapsed_time($decimals = 6)
@@ -1021,7 +1021,7 @@ class CI_DB_driver {
* @param string the error message
* @param string any "swap" values
* @param boolean whether to localize the message
- * @return string sends the application/errror_db.php template
+ * @return string sends the application/error_db.php template
*/
function display_error($error = '', $swap = '', $native = FALSE)
{