From 35f59acf4131a482b4e9ef2cd80b71cb6e9fb27f Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 2 Jul 2014 14:46:15 +0000 Subject: [PATCH] Zip still needs the encoding, lost in previous commit. --- phpgwapi/inc/class.egw_vfs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpgwapi/inc/class.egw_vfs.inc.php b/phpgwapi/inc/class.egw_vfs.inc.php index 0faf410a18..b078cd7362 100644 --- a/phpgwapi/inc/class.egw_vfs.inc.php +++ b/phpgwapi/inc/class.egw_vfs.inc.php @@ -1420,7 +1420,7 @@ class egw_vfs extends vfs_stream_wrapper // Use safe names - replace unsafe chars, convert to ASCII (ZIP spec says CP437, but we'll try) $path = explode('/',$_name); - $_name = translation::to_ascii(implode('/', str_replace($replace,'_',$path))); + $_name = translation::convert(translation::to_ascii(implode('/', str_replace($replace,'_',$path))),false,'ASCII'); // Don't go infinite with app entries if(self::is_link($addfile))