diff options
| author | Flare <flare@lefs.me> | 2016-09-18 23:46:52 +0800 |
|---|---|---|
| committer | Flare <flare@lefs.me> | 2016-11-08 22:09:48 +0800 |
| commit | 01c5233b53d931996844716dfe80511fd1f9abb5 (patch) | |
| tree | e097e6d6957ec741da3654db8e6f261f26c1378a | |
| parent | 7e15ff9486cde36b76f3d39b7db23f89278acb7d (diff) | |
| download | gitea-01c5233b53d931996844716dfe80511fd1f9abb5.tar.gz gitea-01c5233b53d931996844716dfe80511fd1f9abb5.zip | |
Fixed 404 caused by unexpected question mark
This fixes 404 caused when creating new files or wiki pages with question marks. Amended to force CI rebuild
| -rw-r--r-- | modules/template/template.go | 2 | ||||
| -rw-r--r-- | routers/repo/editor.go | 2 | ||||
| -rw-r--r-- | templates/repo/wiki/view.tmpl | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/modules/template/template.go b/modules/template/template.go index 3a6eb042bb..f005d5ce17 100644 --- a/modules/template/template.go +++ b/modules/template/template.go @@ -97,7 +97,7 @@ func NewFuncMap() []template.FuncMap { "MD5": base.EncodeMD5, "ActionContent2Commits": ActionContent2Commits, "EscapePound": func(str string) string { - return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20").Replace(str) + return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20", "?", "%3F").Replace(str) }, "RenderCommitMessage": RenderCommitMessage, "ThemeColorMetaTag": func() string { diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 428a25d568..f572615e78 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -264,7 +264,7 @@ func editFilePost(ctx *context.Context, form auth.EditRepoFileForm, isNewFile bo return } - ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + form.TreePath) + ctx.Redirect(ctx.Repo.RepoLink + "/src/" + branchName + "/" + strings.NewReplacer("%", "%25", "#", "%23", " ", "%20", "?", "%3F").Replace(form.TreePath)) } func EditFilePost(ctx *context.Context, form auth.EditRepoFileForm) { diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl index ff828789c8..ecf80c884f 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -48,9 +48,9 @@ {{.title}} {{if and .IsRepositoryWriter (not .Repository.IsMirror)}} <div class="ui right"> - <a class="ui small button" href="{{.RepoLink}}/wiki/{{.PageURL}}/_edit">{{.i18n.Tr "repo.wiki.edit_page_button"}}</a> + <a class="ui small button" href="{{.RepoLink}}/wiki/{{EscapePound .PageURL}}/_edit">{{.i18n.Tr "repo.wiki.edit_page_button"}}</a> <a class="ui green small button" href="{{.RepoLink}}/wiki/_new">{{.i18n.Tr "repo.wiki.new_page_button"}}</a> - <a class="ui red small button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{.PageURL}}/delete" data-id="{{.PageURL}}">{{.i18n.Tr "repo.wiki.delete_page_button"}}</a> + <a class="ui red small button delete-button" href="" data-url="{{.RepoLink}}/wiki/{{EscapePound .PageURL}}/delete" data-id="{{EscapePound .PageURL}}">{{.i18n.Tr "repo.wiki.delete_page_button"}}</a> </div> {{end}} <div class="ui sub header"> |