From 0a9b7d461912f348637b971717cfde6a82b2a3b4 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Sun, 25 May 2008 00:28:49 +0200 Subject: [PATCH] [svn r15390] Fix other character encoding problems, fixes the 'No templates' message problem - improved - see FS#2589 --- main/inc/lib/fckeditor/fcktemplates.xml.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php index dc66bc68f4..5c933d1e66 100644 --- a/main/inc/lib/fckeditor/fcktemplates.xml.php +++ b/main/inc/lib/fckeditor/fcktemplates.xml.php @@ -15,8 +15,9 @@ function loadCSS($css_name) function s($var) { global $charset; - //return str_replace('&','&',mb_convert_encoding(get_lang($var),'UTF-8',$charset)); - return htmlentities(get_lang($var), ENT_NOQUOTES, $charset); + $search = array('&','<','>'); + $replace = array ('&','&lt;','&gt;'); + return str_replace($search,$replace,mb_convert_encoding(get_lang($var),'UTF-8',$charset)); } /** * Transforms a string into XML-usable code @@ -24,8 +25,9 @@ function s($var) function s2($var) { global $charset; - //return str_replace('&','&',mb_convert_encoding($var,'UTF-8',$charset)); - return htmlentities($var, ENT_NOQUOTES, $charset); + $search = array('&','<','>'); + $replace = array ('&','&lt;','&gt;'); + return str_replace($search,$replace,mb_convert_encoding($var,'UTF-8',$charset)); } $css = loadCSS(api_get_setting('stylesheets')); $img_dir = api_get_path(WEB_IMG_PATH);