Index: branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php5/ErrorHandler/FileUpload.php
===================================================================
diff -u -N -r15042 -r15316
--- branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php5/ErrorHandler/FileUpload.php	(.../FileUpload.php)	(revision 15042)
+++ branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php5/ErrorHandler/FileUpload.php	(.../FileUpload.php)	(revision 15316)
@@ -4,7 +4,7 @@
  * CKFinder
  * ========
  * http://ckfinder.com
- * Copyright (C) 2007-2011, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (C) 2007-2012, CKSource - Frederico Knabben. All rights reserved.
  *
  * The software, this file and its contents are subject to the CKFinder
  * License. Please read the license.txt file before using, installing, copying,
@@ -47,36 +47,36 @@
         $oRegistry = & CKFinder_Connector_Core_Factory :: getInstance("Core_Registry");
         $sFileName = $oRegistry->get("FileUpload_fileName");
         $sFileUrl = $oRegistry->get("FileUpload_url");
+        $sEncodedFileName = CKFinder_Connector_Utils_FileSystem::convertToConnectorEncoding($sFileName);
 
         header('Content-Type: text/html; charset=utf-8');
 
-        $errorMessage = CKFinder_Connector_Utils_Misc :: getErrorMessage($number, $sFileName);
+        $errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sEncodedFileName);
         if (!$uploaded) {
             $sFileName = "";
+            $sEncodedFileName = "";
         }
         if (!empty($_GET['response_type']) && $_GET['response_type'] == 'txt') {
-          echo $sFileName."|".$errorMessage;
-          exit;
+            echo $sFileName."|".$errorMessage;
         }
-        echo "<script type=\"text/javascript\">";
+        else {
+            echo "<script type=\"text/javascript\">";
+            if (!empty($_GET['CKFinderFuncNum'])) {
 
-        if (!empty($_GET['CKFinderFuncNum'])) {
-            $errorMessage = CKFinder_Connector_Utils_Misc::getErrorMessage($number, $sFileName);
+                if (!$uploaded) {
+                    $sFileUrl = "";
+                    $sFileName = "";
+                }
 
-            if (!$uploaded) {
-                $sFileUrl = "";
-                $sFileName = "";
+                $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKFinderFuncNum']);
+                echo "window.parent.CKFinder.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
             }
-
-            $funcNum = preg_replace("/[^0-9]/", "", $_GET['CKFinderFuncNum']);
-            echo "window.parent.CKFinder.tools.callFunction($funcNum, '" . str_replace("'", "\\'", $sFileUrl . $sFileName) . "', '" .str_replace("'", "\\'", $errorMessage). "');";
+            else {
+                echo "window.parent.OnUploadCompleted('" . str_replace("'", "\\'", $sEncodedFileName) . "', '" . str_replace("'", "\\'", $errorMessage) . "') ;";
+            }
+            echo "</script>";
         }
-        else {
-            echo "window.parent.OnUploadCompleted('" . str_replace("'", "\\'", $sFileName) . "', '" . str_replace("'", "\\'", $errorMessage) . "') ;";
-        }
 
-        echo "</script>";
-
         if ($exit) {
             exit;
         }