Merge branch 'MDL-59005-master' of git://github.com/lameze/moodle

This commit is contained in:
Dan Poltawski 2017-06-20 09:51:50 +01:00
commit 4431f1e0e3

View File

@ -662,6 +662,7 @@ class zip_archive extends file_archive {
case 'ISO-8859-6': $encoding = 'CP720'; break;
case 'ISO-8859-7': $encoding = 'CP737'; break;
case 'ISO-8859-8': $encoding = 'CP862'; break;
case 'WINDOWS-1251': $encoding = 'CP866'; break;
case 'EUC-JP':
case 'UTF-8':
if ($winchar = get_string('localewincharset', 'langconfig')) {