Merge branch 'w04_MDL-37407_m24_chineseunzip' of git://github.com/skodak/moodle into MOODLE_24_STABLE

2013-01-28 13:31:54 +13:00
parent 452a704ae9 401dc3dbb9
commit e86e05ebf0
1 changed files with 7 additions and 0 deletions
@@ -544,6 +544,13 @@ 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 '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');