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

Revert "Revert "FIX: upload URLs from S3 on subfolder installs""

Browse Source 
This reverts commit 26c96e97e5.

We have no choice but to run this code
This commit is contained in:
Sam
2018-08-22 11:31:33 +10:00
parent 26c96e97e5
commit f5142861e5
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/file_store/s3_store.rb
View File

@@ -91,7 +91,7 @@ module FileStore
return url if SiteSetting.Upload.s3_cdn_url.blank?
schema = url[/^(https?:)?\/\//, 1]
folder = @s3_helper.s3_bucket_folder_path.nil? ? "" : "#{@s3_helper.s3_bucket_folder_path}/"
url.sub("#{schema}#{absolute_base_url}/#{folder}", "#{SiteSetting.Upload.s3_cdn_url}/")
url.sub("#{schema}#{absolute_base_url}/#{folder}", "#{SiteSetting.Upload.s3_cdn_url}#{Discourse.base_uri}/")
end
def cache_avatar(avatar, user_id)