Merge branch 'MDL-59005-32' of git://github.com/lameze/moodle into MOODLE_32_STABLE

2017-06-20 09:52:46 +01:00
parent 485decb3a2 90156e427c
commit f730eb2a81
1 changed files with 1 additions and 0 deletions
@@ -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')) {