1842.patch on Ticket #1842 – Attachment – CKEditor

editor/filemanager/browser/default/browser.html

 <html>
         <head>
                 <title>FCKeditor - Resources Browser</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
                 <link href="browser.css" type="text/css" rel="stylesheet">
                 <script type="text/javascript" src="js/fckxml.js"></script>
                 <script language="javascript">

 -->
 <html>
         <head>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
                 <link href="browser.css" type="text/css" rel="stylesheet">
                 <script type="text/javascript">

 <html>
         <head>
                 <link href="browser.css" type="text/css" rel="stylesheet">
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
                 <script type="text/javascript" src="js/common.js"></script>
                 <script language="javascript">

 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
         <link href="browser.css" type="text/css" rel="stylesheet" />
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <script type="text/javascript" src="js/common.js"></script>
         <script type="text/javascript">

 <html xmlns="http://www.w3.org/1999/xhtml">
         <head>
                 <title>File Upload</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
                 <link href="browser.css" type="text/css" rel="stylesheet" />
                 <script type="text/javascript" src="js/common.js"></script>
                 <script type="text/javascript">

         return preg_replace( $sPattern, '', $sourceString ) ;
+}
+function FindBadUtf8( $string )
+{
+        $regex =
+        '([\x00-\x7F]'.
+        '|[\xC2-\xDF][\x80-\xBF]'.
+        '|\xE0[\xA0-\xBF][\x80-\xBF]'.
+        '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
+        '|\xED[\x80-\x9F][\x80-\xBF]'.
+        '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
+        '|[\xF1-\xF3][\x80-\xBF]{3}'.
+        '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
+        '|(.{1}))';
+        while (preg_match('/'.$regex.'/S', $string, $matches)) {
+                if ( isset($matches[2])) {
+                        return true;
+                }
+                $string = substr($string, strlen($matches[0]));
+        }
+        return false;
+}
 function ConvertToXmlAttribute( $value )
+{
         if ( defined( 'PHP_OS' ) )
 …
                 $os = php_uname() ;
+        }
         if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' )
+        if ( strtoupper( substr( $os, 0, 3 ) ) === 'WIN' || FindBadUtf8( $value ) )
+        {
                 return ( utf8_encode( htmlspecialchars( $value ) ) ) ;
+        }

 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
         <title>FCKeditor - Connectors Tests</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <script type="text/javascript">
 function BuildBaseUrl( command )

 <html>
         <head>
                 <title>FCKeditor - Uploaders Tests</title>
+                <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
                 <script type="text/javascript">
 function SendFile()