#2283 set text/plain for non-binary files in raw mode

This commit is contained in:
Unknwon 2015-12-25 05:45:07 -05:00
parent 85af36332b
commit 93f03707a7
5 changed files with 10 additions and 4 deletions

View file

@ -53,7 +53,11 @@ func ShortSha(sha1 string) string {
}
func DetectEncoding(content []byte) string {
_, name, certain := charset.DetermineEncoding(content, setting.Repository.AnsiCharset)
_, name, certain := charset.DetermineEncoding(content, "")
if name != "utf-8" && len(setting.Repository.AnsiCharset) > 0 {
log.Debug("Using default AnsiCharset: %s", setting.Repository.AnsiCharset)
return setting.Repository.AnsiCharset
}
log.Debug("Detected encoding: %s (%v)", name, certain)
return name
}