troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 12:53:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix inconsistent wiki path converting. (#24277)

Browse source 
The Infinite Monkey Random Typing catches a bug, inconsistent wiki path
converting.

Close #24276

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
wxiaoguang 2023-04-23 19:16:30 +08:00 committed by GitHub
parent 44e0cfa96e
commit 60e7963141
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/wiki/wiki_path.go
View file

@ -72,7 +72,7 @@ func unescapeSegment(s string) (string, error) {
} }
func escapeSegToWeb(s string, hadDashMarker bool) string { func escapeSegToWeb(s string, hadDashMarker bool) string {
if hadDashMarker || strings.Contains(s, "-") { if hadDashMarker || strings.Contains(s, "-") || strings.HasSuffix(s, ".md") {
s = addDashMarker(s) s = addDashMarker(s)
} else { } else {
s = strings.ReplaceAll(s, " ", "-") s = strings.ReplaceAll(s, " ", "-")

1
services/wiki/wiki_test.go
View file

@ -35,6 +35,7 @@ func TestUserTitleToWebPath(t *testing.T) {
} }
for _, test := range []test{ for _, test := range []test{
{"wiki-name", "wiki name"}, {"wiki-name", "wiki name"},
{"title.md.-", "title.md"},
{"wiki-name.-", "wiki-name"}, {"wiki-name.-", "wiki-name"},
{"the+wiki-name.-", "the wiki-name"}, {"the+wiki-name.-", "the wiki-name"},
{"a%2Fb", "a/b"}, {"a%2Fb", "a/b"},