summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-02-04 11:55:53 +0100
committerAndrey Andreev <narf@devilix.net>2015-02-04 11:55:53 +0100
commit7a0f2ab75c51125b4992e14ac76dad38a4eb7680 (patch)
treeb2fdaf7de2aa398cf7dc2c9ccf9eda5a68b43579
parentd22ba47139cf294506b9a1f34cc996f23155ebf5 (diff)
parent8194ce50c3eae0f371e338d9093b99e2ff1b4d16 (diff)
Merge pull request #3556 from gadelat/FuncTypoFix
Fix typos in func names
-rw-r--r--system/database/drivers/mssql/mssql_result.php2
-rw-r--r--system/libraries/Encryption.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php
index 8828dc9e6..c1c42a486 100644
--- a/system/database/drivers/mssql/mssql_result.php
+++ b/system/database/drivers/mssql/mssql_result.php
@@ -107,7 +107,7 @@ class CI_DB_mssql_result extends CI_DB_result {
public function field_data()
{
$retval = array();
- for ($i = 0, $c = $this->num_field(); $i < $c; $i++)
+ for ($i = 0, $c = $this->num_fields(); $i < $c; $i++)
{
$field = mssql_fetch_field($this->result_id, $i);
diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
index 171a28b34..fad4ea7f8 100644
--- a/system/libraries/Encryption.php
+++ b/system/libraries/Encryption.php
@@ -248,7 +248,7 @@ class CI_Encryption {
$params['mode'] = strtolower($params['mode']);
if ( ! isset($this->_modes['mcrypt'][$params['mode']]))
{
- log_message('error', 'Encryption: MCrypt mode '.strtotupper($params['mode']).' is not available.');
+ log_message('error', 'Encryption: MCrypt mode '.strtoupper($params['mode']).' is not available.');
}
else
{
@@ -299,7 +299,7 @@ class CI_Encryption {
$params['mode'] = strtolower($params['mode']);
if ( ! isset($this->_modes['openssl'][$params['mode']]))
{
- log_message('error', 'Encryption: OpenSSL mode '.strtotupper($params['mode']).' is not available.');
+ log_message('error', 'Encryption: OpenSSL mode '.strtoupper($params['mode']).' is not available.');
}
else
{