diff options
| -rw-r--r-- | modules/base/markdown.go | 2 | ||||
| -rw-r--r-- | routers/repo/repo.go | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/modules/base/markdown.go b/modules/base/markdown.go index a98ca8cf00..962e1ae1e9 100644 --- a/modules/base/markdown.go +++ b/modules/base/markdown.go @@ -53,7 +53,7 @@ func IsTextFile(data []byte) (string, bool) { func IsImageFile(data []byte) (string, bool) { contentType := http.DetectContentType(data) - if strings.Index(contentType, "img/") != -1 { + if strings.Index(contentType, "image/") != -1 { return contentType, true } return contentType, false diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 8c686bc3d6..3b57cb39f6 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -225,8 +225,18 @@ func SingleDownload(ctx *middleware.Context, params martini.Params) { // Get tree path treename := params["_1"] - repoFile, err := models.GetTargetFile(params["username"], params["reponame"], - params["branchname"], params["commitid"], treename) + branchName := params["branchname"] + userName := params["username"] + repoName := params["reponame"] + + var commitId string + if !models.IsBranchExist(userName, repoName, branchName) { + commitId = branchName + branchName = "" + } + + repoFile, err := models.GetTargetFile(userName, repoName, + branchName, commitId, treename) if err != nil { ctx.Handle(404, "repo.SingleDownload(GetTargetFile)", err) |