diff options
| author | Matthias Loibl <mail@matthiasloibl.com> | 2016-11-08 18:28:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 18:27:59 +0100 |
| commit | 45c4539c6168aa248e425033731ab7a9a21c5958 (patch) | |
| tree | 7235c6a9dc9d75a092d7d03a28d6ad790e47136b | |
| parent | f6d53ecbc1a1f1475d2ed6753176db43278dfd7f (diff) | |
| parent | 01c5233b53d931996844716dfe80511fd1f9abb5 (diff) | |
| download | gitea-45c4539c6168aa248e425033731ab7a9a21c5958.tar.gz gitea-45c4539c6168aa248e425033731ab7a9a21c5958.zip | |
Merge pull request #17 from LefsFlarey/issue/3666
Fixed 404 caused by unexpected question mark
| -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 3fe49fa380..000ad86770 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 26f74ef3d0..b4aac27bea 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 dc4938ab0c..b8b0d2702a 100644 --- a/templates/repo/wiki/view.tmpl +++ b/templates/repo/wiki/view.tmpl @@ -54,9 +54,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"> |