summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-04-29 00:00:42 +0200
committerAndrey Andreev <narf@devilix.net>2014-04-29 00:00:42 +0200
commitfd6efad5ac8bd5e7d08266ec407016221cd9ce99 (patch)
tree9d6e9cd5afaeeb778ea36d75b76433f8fc6e4a95
parent4e35824ca5f89bdd58827360e16f151e6f5cc61b (diff)
Small fixes (PR #3022)
- Fix incorrect variable in mb_strlen() compat - Micro-optimization of array_replace(), array_replace_recursive() compat
-rw-r--r--system/core/compat/array.php4
-rw-r--r--system/core/compat/mbstring.php2
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().');