From ee7f7df62402c1a3f00f67d9183fb84dd7768338 Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 14 May 2009 11:57:02 +0200 Subject: [PATCH] [svn r20629] FS#306 - The multibyte string library: A correction of the previous commit SVN#20624. --- main/inc/lib/multibyte_string_functions.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/inc/lib/multibyte_string_functions.lib.php b/main/inc/lib/multibyte_string_functions.lib.php index 7e815d1f42..80004c5685 100644 --- a/main/inc/lib/multibyte_string_functions.lib.php +++ b/main/inc/lib/multibyte_string_functions.lib.php @@ -99,7 +99,7 @@ function api_to_system_encoding($string, $from_encoding = null, $check_utf8_vali // See http://php.net/manual/en/function.htmlentities function api_htmlentities($string, $quote_style = ENT_COMPAT, $encoding = null) { if (empty($encoding)) { - $from_encoding = api_mb_internal_encoding(); + $encoding = api_mb_internal_encoding(); } if (!api_is_utf8($encoding) && api_html_entity_supports($encoding)) { return htmlentities($string, $quote_style, $encoding); @@ -123,7 +123,7 @@ function api_htmlentities($string, $quote_style = ENT_COMPAT, $encoding = null) // See http://php.net/html_entity_decode function api_html_entity_decode($string, $quote_style = ENT_COMPAT, $encoding = null) { if (empty($encoding)) { - $from_encoding = api_mb_internal_encoding(); + $encoding = api_mb_internal_encoding(); } if (!api_is_utf8($encoding) && api_html_entity_supports($encoding)) { return html_entity_decode($string, $quote_style, $encoding);