Merge pull request #1404 from wqweto/develop

Allow space and/or percent in file and directory names

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/base/template.go b/modules/base/template.go
index f0a2e032..2a81a34d 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -55,7 +55,7 @@ func ShortSha(sha1 string) string {
 func DetectEncoding(content []byte) (string, error) {
 	detector := chardet.NewTextDetector()
 	result, err := detector.DetectBest(content)
-	if result.Charset == "ISO-8859-1" {
+	if result.Charset != "UTF-8" && len(setting.AnsiCharset) > 0 {
 		return setting.AnsiCharset, err
 	}
 	return result.Charset, err
@@ -67,7 +67,7 @@ func ToUtf8WithErr(content []byte) (error, string) {
 		return err, ""
 	}
 
-	if charsetLabel == "utf8" {
+	if charsetLabel == "UTF-8" {
 		return nil, string(content)
 	}