Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ func uploadLogo(input, filename string) (logoURL string, err error) {
return
}

// Respect Force HTTPS setting when generating logo URL
if Settings.ForceHttps && Settings.HttpsThreadfinDomain != "" {
logoURL = fmt.Sprintf("https://%s:%d/data_images/%s", Settings.HttpsThreadfinDomain, Settings.HttpsPort, filename)
} else if Settings.HttpThreadfinDomain != "" {
logoURL = fmt.Sprintf("http://%s:%s/data_images/%s", Settings.HttpThreadfinDomain, Settings.Port, filename)
} else {
logoURL = fmt.Sprintf("%s://%s/data_images/%s", System.ServerProtocol.XML, System.Domain, filename)
}

return

Expand Down