From 429c92c0ce15213e52fdacb3d28ee2f3a3a5a63f Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Sun, 28 Aug 2016 05:32:10 -0700
Subject: [PATCH] #3516 enforce line ending to be \n from web editor
---
routers/repo/editor.go | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/routers/repo/editor.go b/routers/repo/editor.go
index 4a82f291e8f..9346593daa9 100644
--- a/routers/repo/editor.go
+++ b/routers/repo/editor.go
@@ -263,7 +263,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo
OldTreeName: oldTreePath,
NewTreeName: form.TreePath,
Message: message,
- Content: form.Content,
+ Content: strings.Replace(form.Content, "\r", "", -1),
IsNewFile: isNewFile,
}); err != nil {
ctx.Data["Err_TreePath"] = true
@@ -284,7 +284,6 @@ func NewFilePost(ctx *context.Context, form auth.EditRepoFileForm) {
func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) {
treePath := ctx.Repo.TreePath
- content := form.Content
entry, err := ctx.Repo.Commit.GetTreeEntryByPath(treePath)
if err != nil {
@@ -295,7 +294,7 @@ func DiffPreviewPost(ctx *context.Context, form auth.EditPreviewDiffForm) {
return
}
- diff, err := ctx.Repo.Repository.GetDiffPreview(ctx.Repo.BranchName, treePath, content)
+ diff, err := ctx.Repo.Repository.GetDiffPreview(ctx.Repo.BranchName, treePath, form.Content)
if err != nil {
ctx.Error(500, "GetDiffPreview: "+err.Error())
return