fix: support delete non-urlencoded wiki page (#16482)

* fix: support delete non-urlencoded wiki page

* fix: check error
tokarchuk/v1.17
Gary Wang 3 years ago committed by GitHub
parent 2256499db5
commit e01b782f33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 11
      services/wiki/wiki.go

@ -308,14 +308,9 @@ 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) return fmt.Errorf("Unable to read HEAD tree to index in: %s %v", basePath, err)
} }
wikiPath := NameToFilename(wikiName) found, wikiPath, err := prepareWikiFileName(gitRepo, wikiName)
filesInIndex, err := gitRepo.LsFiles(wikiPath) if err != nil {
found := false return err
for _, file := range filesInIndex {
if file == wikiPath {
found = true
break
}
} }
if found { if found {
err := gitRepo.RemoveFilesFromIndex(wikiPath) err := gitRepo.RemoveFilesFromIndex(wikiPath)

Loading…
Cancel
Save