Merge branch 'MOODLE_28_STABLE' of https://github.com/mitstek/moodle into MOODLE_28_STABLE

2015-03-02 17:27:15 +00:00
parent a62cc33c1f 9b1c53771a
commit f479a30931
1 changed files with 1 additions and 0 deletions
@@ -656,6 +656,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 'EUC-JP':
                            case 'UTF-8':
                                if ($winchar = get_string('localewincharset', 'langconfig')) {
                                    // Most probably works only for zh_cn,