Small fixes (PR #3022)

- Fix incorrect variable in mb_strlen() compat
- Micro-optimization of array_replace(), array_replace_recursive() compat

2 files changed, 3 insertions, 3 deletions

diff --git a/system/core/compat/array.php b/system/core/compat/array.php
index b291703ed..07dae21c2 100644
--- a/system/core/compat/array.php
+++ b/system/core/compat/array.php
@@ -163,7 +163,7 @@ if ( ! function_exists('array_replace'))
 		$array = array_shift($arrays);
 		$c--;
 
-		for ($i = 0, $c = count($arrays); $i < $c; $i++)
+		for ($i = 0; $i < $c; $i++)
 		{
 			if ( ! is_array($arrays[$i]))
 			{
@@ -218,7 +218,7 @@ if ( ! function_exists('array_replace_recursive'))
 		$array = array_shift($arrays);
 		$c--;
 
-		for ($i = 0, $c = count($arrays); $i < $c; $i++)
+		for ($i = 0; $i < $c; $i++)
 		{
 			if ( ! is_array($arrays[$i]))
 			{
diff --git a/system/core/compat/mbstring.php b/system/core/compat/mbstring.php
index 91ea8017c..314dbe9ba 100644
--- a/system/core/compat/mbstring.php
+++ b/system/core/compat/mbstring.php
@@ -63,7 +63,7 @@ if ( ! function_exists('mb_strlen'))
 	{
 		if (ICONV_ENABLED === TRUE)
 		{
-			return iconv_strlen($str, isset($charset) ? $charset : config_item('charset'));
+			return iconv_strlen($str, isset($encoding) ? $encoding : config_item('charset'));
 		}
 
 		log_message('debug', 'Compatibility (mbstring): iconv_strlen() is not available, falling back to strlen().');