lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#3559 fix template error

release/v1.15
Unknwon 2016-08-31 13:59:23 -07:00
parent c2afdf2192
commit dadd35b636
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.97.0830" const APP_VER = "0.9.97.0831"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

4
modules/base/tool.go
View File

@ -518,7 +518,11 @@ func IsLetter(ch rune) bool {
return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= 0x80 && unicode.IsLetter(ch) return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= 0x80 && unicode.IsLetter(ch)
} }
// IsTextFile returns true if file content format is plain text or empty.
func IsTextFile(data []byte) bool { func IsTextFile(data []byte) bool {
if len(data) == 0 {
return true
}
return strings.Index(http.DetectContentType(data), "text/") != -1 return strings.Index(http.DetectContentType(data), "text/") != -1
} }

4
routers/repo/editor.go
View File

@ -64,9 +64,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
buf := make([]byte, 1024) buf := make([]byte, 1024)
n, _ := dataRc.Read(buf) n, _ := dataRc.Read(buf)
if n > 0 { buf = buf[:n]
buf = buf[:n]
}
// Only text file are editable online. // Only text file are editable online.
if !base.IsTextFile(buf) { if !base.IsTextFile(buf) {

9
routers/repo/view.go
View File

@ -64,6 +64,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
} }
if readmeFile != nil { if readmeFile != nil {
ctx.Data["RawFileLink"] = ""
ctx.Data["ReadmeInList"] = true ctx.Data["ReadmeInList"] = true
ctx.Data["ReadmeExist"] = true ctx.Data["ReadmeExist"] = true
@ -75,9 +76,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
buf := make([]byte, 1024) buf := make([]byte, 1024)
n, _ := dataRc.Read(buf) n, _ := dataRc.Read(buf)
if n > 0 { buf = buf[:n]
buf = buf[:n]
}
isTextFile := base.IsTextFile(buf) isTextFile := base.IsTextFile(buf)
ctx.Data["FileIsText"] = isTextFile ctx.Data["FileIsText"] = isTextFile
@ -134,9 +133,7 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
buf := make([]byte, 1024) buf := make([]byte, 1024)
n, _ := dataRc.Read(buf) n, _ := dataRc.Read(buf)
if n > 0 { buf = buf[:n]
buf = buf[:n]
}
isTextFile := base.IsTextFile(buf) isTextFile := base.IsTextFile(buf)
ctx.Data["IsTextFile"] = isTextFile ctx.Data["IsTextFile"] = isTextFile

2
templates/.VERSION
View File

@ -1 +1 @@
0.9.97.0830 0.9.97.0831