From ed8586ab21352c931c9a16914bb020a51e41270c Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Mon, 19 Jul 2021 13:05:57 +0800 Subject: [PATCH 1/2] fix: support delete non-urlencoded wiki page --- services/wiki/wiki.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 16301034da15e..940e0f7e7c033 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -308,15 +308,7 @@ func DeleteWikiPage(doer *models.User, repo *models.Repository, wikiName string) return fmt.Errorf("Unable to read HEAD tree to index in: %s %v", basePath, err) } - wikiPath := NameToFilename(wikiName) - filesInIndex, err := gitRepo.LsFiles(wikiPath) - found := false - for _, file := range filesInIndex { - if file == wikiPath { - found = true - break - } - } + found, wikiPath, err := prepareWikiFileName(gitRepo, wikiName) if found { err := gitRepo.RemoveFilesFromIndex(wikiPath) if err != nil { From 2477a0976345c7b5ae25719f32b249cb200dafda Mon Sep 17 00:00:00 2001 From: Gary Wang Date: Mon, 19 Jul 2021 23:42:07 +0800 Subject: [PATCH 2/2] fix: check error --- services/wiki/wiki.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 940e0f7e7c033..94f36ea2f2504 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -309,6 +309,9 @@ func DeleteWikiPage(doer *models.User, repo *models.Repository, wikiName string) } found, wikiPath, err := prepareWikiFileName(gitRepo, wikiName) + if err != nil { + return err + } if found { err := gitRepo.RemoveFilesFromIndex(wikiPath) if err != nil {