github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Revert "FIX: GlobalPath#upload_cdn_path when S3 bucket has a folder (#6523)""

Browse Source 
This reverts commit 322b27b6dcba0ec37323b3fef64fec6075c68fe6.

Oops rushed on the revert here... should be good
This commit is contained in:
Sam
2018-10-24 15:14:01 +11:00
parent 322b27b6dc
commit e955a7b49d
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/global_path.rb
View File

@ -9,7 +9,7 @@ module GlobalPath
def upload_cdn_path(p)
if SiteSetting.Upload.s3_cdn_url.present?
p = p.sub(Discourse.store.absolute_base_url, SiteSetting.Upload.s3_cdn_url)
p = Discourse.store.cdn_url(p)
end
p =~ /^http/ ? p : cdn_path(p)
end