IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: errors loading secure uploads when secure uploads is disabled (#13047)

Browse Source
This commit is contained in:
Neil Lalonde
2021-06-08 13:25:51 -04:00
committed by GitHub
parent 49c231c993
commit c2c647b990
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/url_helper.rb
View File

@@ -77,15 +77,16 @@ class UrlHelper
end
def self.cook_url(url, secure: false, local: nil)
is_secure = SiteSetting.secure_media && secure
local = is_local(url) if local.nil?
return url if !local
url = secure ? secure_proxy_without_cdn(url) : absolute_without_cdn(url)
url = is_secure ? secure_proxy_without_cdn(url) : absolute_without_cdn(url)
# we always want secure media to come from
# Discourse.base_url_no_prefix/secure-media-uploads
# to avoid asset_host mixups
return schemaless(url) if secure
return schemaless(url) if is_secure
# PERF: avoid parsing url except for extreme conditions
# this is a hot path used on home page