Removing double encoding to fix 1252

pydio · Nov 21, 2016 · e2c684a · e2c684a
1 parent 67c037a
commit e2c684a
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -2385,7 +2385,7 @@ public function nodeWillChange($node, $newSize = null)
      */
     public function makeZip (UserSelection $selection, $dest, $basedir, $taskId = null)
     {
-        $zipEncoding = ConfService::getContextConf($selection->getContext(), "ZIP_ENCODING");
+
 
         @set_time_limit(0);
         require_once(AJXP_BIN_FOLDER."/lib/pclzip.lib.php");
@@ -2398,10 +2398,6 @@ public function makeZip (UserSelection $selection, $dest, $basedir, $taskId = nu
                 $filePaths[] = [PCLZIP_ATT_FILE_NAME => $realFile];
             } else {
                 $shortName = $node->getLabel();
-                if(!empty($zipEncoding)){
-                    $test = iconv(TextEncoder::getEncoding(), $zipEncoding, $shortName);
-                    if($test !== false) $shortName = $test;
-                }
                 $filePaths[] = [PCLZIP_ATT_FILE_NAME => $realFile,
                                     PCLZIP_ATT_FILE_NEW_SHORT_NAME => $shortName];
             }