Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'w04_MDL-37407_m24_chineseunzip' of git://github.com/sko…

…dak/moodle into MOODLE_24_STABLE
  • Loading branch information...
commit e86e05ebf0022c5708a3c2562d93a1233097da59 2 parents 452a704 + 401dc3d
@samhemelryk samhemelryk authored
Showing with 7 additions and 0 deletions.
  1. +7 −0 lib/filestorage/zip_archive.php
View
7 lib/filestorage/zip_archive.php
@@ -544,6 +544,13 @@ protected function init_namelookup() {
case 'ISO-8859-6': $encoding = 'CP720'; break;
case 'ISO-8859-7': $encoding = 'CP737'; break;
case 'ISO-8859-8': $encoding = 'CP862'; break;
+ case 'UTF-8':
+ if ($winchar = get_string('localewincharset', 'langconfig')) {
+ // Most probably works only for zh_cn,
+ // if there are more problems we could add zipcharset to langconfig files.
+ $encoding = $winchar;
+ }
+ break;
}
}
$newname = @textlib::convert($name, $encoding, 'utf-8');
Please sign in to comment.
Something went wrong with that request. Please try again.