From 1f002c76895e198b6091c0bcfa4fd9110a9cc8ac Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 25 Jun 2009 16:21:31 +0200 Subject: [PATCH] [svn r21615] FS#306 - Fixing an encoding problem in the template list, the FCKEditor. It is strange that the global variable $charset has wrong value in this context. To be invesigated. --- main/inc/lib/fckeditor/fcktemplates.xml.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php index 42a31ccc8e..7657253c62 100644 --- a/main/inc/lib/fckeditor/fcktemplates.xml.php +++ b/main/inc/lib/fckeditor/fcktemplates.xml.php @@ -62,11 +62,11 @@ function s($var) global $charset; $search = array('&','<','>'); $replace = array ('&','&lt;','&gt;'); - return str_replace($search,$replace,api_convert_encoding(get_lang($var),'UTF-8',$charset)); + return str_replace($search, $replace, api_utf8_encode(get_lang($var))); } /** - * Transforms a language variable into XML-usable code + * Transforms some text into XML-usable code * * @param unknown_type $var * @return unknown @@ -76,7 +76,7 @@ function s2($var) global $charset; $search = array('&','<','>'); $replace = array ('&','&lt;','&gt;'); - return str_replace($search,$replace,api_convert_encoding($var,'UTF-8',$charset)); + return str_replace($search, $replace, api_utf8_encode($var)); } /**