Fixed issue #7051: Images uploaded in HTML editor end up in wrong dir…

…ectory on Windows
LimeSurvey · Dec 9, 2012 · 348e8de · 348e8de
1 parent c676762
commit 348e8de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/third_party/kcfinder/core/browser.php b/third_party/kcfinder/core/browser.php
@@ -724,6 +724,7 @@ protected function getFiles($dir) {
             if ($stat === false) continue;
             $filename = basename($file);
             if ( 'WIN' == substr( PHP_OS, 0, 3 ) ) {
+                    setlocale( LC_CTYPE, '' ); // Resets the codepage to the system codepage so it can be properly retrieved
                     $codepage = 'Windows-' . trim( strstr( setlocale( LC_CTYPE, 0 ), '.' ), '.' );
                     if ( function_exists( 'iconv' ) ) {
                             $filename = iconv( $codepage,  'UTF-8', $filename );

diff --git a/third_party/kcfinder/core/uploader.php b/third_party/kcfinder/core/uploader.php
@@ -342,7 +342,8 @@ protected function normalizeFilename($filename) {
         )
             $filename = strtr($filename, $this->config['filenameChangeChars']);
         // On Windows platforms, PHP will mangle non-ASCII characters, see http://bugs.php.net/bug.php?id=47096
-        if ( 'WIN' == substr( PHP_OS, 0, 3 ) ) {
+        if ( 'WIN' == substr( PHP_OS, 0, 3 )) {
+                setlocale( LC_CTYPE, '' ); // Resets the codepage to the system codepage so it can be properly retrieved
                 $codepage = 'Windows-' . trim( strstr( setlocale( LC_CTYPE, 0 ), '.' ), '.' );
                 if ( function_exists( 'iconv' ) ) {
                         $filename = iconv( 'UTF-8', $codepage, $filename );