diff options
author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:50:52 -0500 |
---|---|---|
committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-02-12 14:50:52 -0500 |
commit | d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa (patch) | |
tree | a99a74d6b858d73624c06f85e393acbe97c90586 /app/post.go | |
parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
parent | 3da5df3c90f5888a3490881957befabb37c308d5 (diff) | |
download | chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.gz chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.tar.bz2 chat-d88d2bc2ed3aefa68b5ed2942f493ae42bb40bfa.zip |
Merge branch 'release-4.7-t4merge'
Diffstat (limited to 'app/post.go')
-rw-r--r-- | app/post.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/post.go b/app/post.go index 005624605..be9374e10 100644 --- a/app/post.go +++ b/app/post.go @@ -876,6 +876,10 @@ func (a *App) imageProxyConfig() (proxyType, proxyURL, options, siteURL string) proxyURL += "/" } + if siteURL == "" || siteURL[len(siteURL)-1] != '/' { + siteURL += "/" + } + if cfg.ServiceSettings.ImageProxyOptions != nil { options = *cfg.ServiceSettings.ImageProxyOptions } @@ -890,14 +894,10 @@ func (a *App) ImageProxyAdder() func(string) string { } return func(url string) string { - if url == "" || strings.HasPrefix(url, proxyURL) { + if url == "" || url[0] == '/' || strings.HasPrefix(url, siteURL) || strings.HasPrefix(url, proxyURL) { return url } - if url[0] == '/' { - url = siteURL + url - } - switch proxyType { case "atmos/camo": mac := hmac.New(sha1.New, []byte(options)) |