bugfix #7 - non-latin chars in filename

psolom · Jun 20, 2016 · 95d831f · 95d831f
1 parent 6b84989
commit 95d831f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/connectors/php/BaseFilemanager.php b/connectors/php/BaseFilemanager.php
@@ -49,6 +49,10 @@ abstract class BaseFilemanager
 
     public function __construct($extraConfig)
     {
+        // fix display non-latin chars correctly
+        // https://github.com/servocoder/RichFilemanager/issues/7
+        setlocale(LC_CTYPE, 'en_US.UTF-8');
+
         $this->fm_path = isset($extraConfig['fmPath']) && !empty($extraConfig['fmPath'])
             ? $extraConfig['fmPath']
             : dirname(dirname(dirname(__FILE__)));
@@ -78,7 +82,7 @@ public function __construct($extraConfig)
         if(!$config) {
             $this->error("Error parsing the settings file! Please check your JSON syntax.");
         }
-        $this->config = array_replace_recursive ($config_default, $config);
+        $this->config = array_replace_recursive($config_default, $config);
 
         // override config options if needed
         if(!empty($extraConfig)) {

diff --git a/scripts/filemanager.config.default.json b/scripts/filemanager.config.default.json
@@ -16,7 +16,7 @@
         "fileSorting": "NAME_ASC",
         "folderPosition": "bottom",
         "quickSelect": false,
-        "charsLatinOnly": true,
+        "charsLatinOnly": false,
         "splitterWidth": 200,
         "splitterMinWidth": 200,
         "dateFormat": "d M Y H:i",