summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/core/Security.php2
-rw-r--r--system/database/DB_driver.php2
-rw-r--r--system/database/DB_forge.php2
-rw-r--r--system/database/DB_query_builder.php2
-rw-r--r--system/database/DB_result.php14
5 files changed, 11 insertions, 11 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index 8b3149c07..7c18c7406 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -75,7 +75,7 @@ class CI_Security {
/**
* Character set
*
- * Will be overriden by the constructor.
+ * Will be overridden by the constructor.
*
* @var string
*/
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index dd93abc11..a0803f170 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -1643,7 +1643,7 @@ abstract class CI_DB_driver {
/**
* Close DB Connection
*
- * This method would be overriden by most of the drivers.
+ * This method would be overridden by most of the drivers.
*
* @return void
*/
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index c8d773c98..f6ee2a63a 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -828,7 +828,7 @@ abstract class CI_DB_forge {
*/
protected function _attr_type(&$attributes)
{
- // Usually overriden by drivers
+ // Usually overridden by drivers
}
// --------------------------------------------------------------------
diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index c9377e082..79cbfb3ad 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -1699,7 +1699,7 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
* Groups tables in FROM clauses if needed, so there is no confusion
* about operator precedence.
*
- * Note: This is only used (and overriden) by MySQL and CUBRID.
+ * Note: This is only used (and overridden) by MySQL and CUBRID.
*
* @return string
*/
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index af58e3c39..746f2a110 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -556,7 +556,7 @@ class CI_DB_result {
/**
* Number of fields in the result set
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @return int
*/
@@ -572,7 +572,7 @@ class CI_DB_result {
*
* Generates an array of column names.
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @return array
*/
@@ -588,7 +588,7 @@ class CI_DB_result {
*
* Generates an array of objects containing field meta-data.
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @return array
*/
@@ -602,7 +602,7 @@ class CI_DB_result {
/**
* Free the result
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @return void
*/
@@ -620,7 +620,7 @@ class CI_DB_result {
* this internally before fetching results to make sure the
* result set starts at zero.
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @param int $n
* @return bool
@@ -637,7 +637,7 @@ class CI_DB_result {
*
* Returns the result set as an array.
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @return array
*/
@@ -653,7 +653,7 @@ class CI_DB_result {
*
* Returns the result set as an object.
*
- * Overriden by driver result classes.
+ * Overridden by driver result classes.
*
* @param string $class_name
* @return object