Skip to content

Fix images in Wiki repo not showing in Gitea Wiki (#4690) #5013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix images in Wiki repo not showing in Gitea Wiki (#4690) #5013

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
226be7d
Fix images in Wiki repo not showing in Gitea Wiki (#4690)
mattzzw Oct 3, 2018
aac4d1d
Fixed comment according to style guide (#4690)
mattzzw Oct 3, 2018
2e263a0
Fixed fmt (#4690)
mattzzw Oct 5, 2018
06492fc
Fixed code duplication (#4690)
mattzzw Oct 7, 2018
6a0202b
Merge branch 'master' into master
techknowlogick Oct 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions models/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ func WikiNameToFilename(name string) string {
return url.QueryEscape(name) + ".md"
}

// WikiNameToFilenameRaw converts a wiki name to its corresponding raw filename.
func WikiNameToFilenameRaw(name string) string {
name = strings.Replace(name, " ", "-", -1)
return url.QueryEscape(name)
}

// WikiFilenameToName converts a wiki filename to its corresponding page name.
func WikiFilenameToName(filename string) (string, error) {
Copy link
Member

@lafriks lafriks Oct 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WikiNameToFilename should reuse WikiNameToFilenameRaw

Copy link
Author

@mattzzw mattzzw Oct 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review.
Now that I look at the code of models/wiki.go again I can't see the difference between WikiNameToFilenameRawand WikiNameToSubURL. I think I totally duplicated a method that was already in place... Doh.
I will fix that.

if !strings.HasSuffix(filename, ".md") {
Expand Down
2 changes: 1 addition & 1 deletion routers/repo/wiki.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ func WikiRaw(ctx *context.Context) {
if strings.HasSuffix(providedPath, ".md") {
providedPath = providedPath[:len(providedPath)-3]
}
wikiPath := models.WikiNameToFilename(providedPath)
wikiPath := models.WikiNameToFilenameRaw(providedPath)
var entry *git.TreeEntry
if commit != nil {
entry, err = findEntryForFile(commit, wikiPath)
Expand Down