Merge remote-tracking branch 'upstream/develop' into develop

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/mocks/core/security.php b/tests/mocks/core/security.php
index e19a8b20b..a21fc5cb3 100644
--- a/tests/mocks/core/security.php
+++ b/tests/mocks/core/security.php
@@ -10,13 +10,13 @@ class Mock_Core_Security extends CI_Security {
 		return $this;
 	}
 
-	// Overide inaccesible protected properties
+	// Override inaccessible protected properties
 	public function __get($property)
 	{
 		return isset($this->{'_'.$property}) ? $this->{'_'.$property} : NULL;
 	}
 
-	// Overide inaccesible protected method
+	// Override inaccessible protected method
 	public function __call($method, $params)
 	{
 		if (is_callable(array($this, '_'.$method)))
@@ -27,4 +27,4 @@ class Mock_Core_Security extends CI_Security {
 		throw new BadMethodCallException('Method '.$method.' was not found');
 	}
 
-}
\ No newline at end of file
+}