github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rollback changes

Browse Source 
This reverts:
* 1baba84c438e "fix s3 subfolders harder"
* ea5e57938edf "fix test for absolute_base_url change"
This commit is contained in:
Andrew Schleifer
2018-07-06 17:15:28 -05:00
parent f8b90226cb
commit dba22bbde2
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/file_store/s3_store.rb
View File

@ -41,7 +41,7 @@ module FileStore
# if this fails, it will throw an exception
path = @s3_helper.upload(file, path, options)
# return the upload url
"//#{URI.parse(absolute_base_url).hostname}/#{path}"
"#{absolute_base_url}/#{path}"
end
def remove_file(url, path)
@ -65,10 +65,6 @@ module FileStore
@s3_helper.s3_bucket_name
end
def s3_bucket_folder_path
@s3_helper.s3_bucket_folder_path
end
def absolute_base_url
@absolute_base_url ||= SiteSetting.Upload.absolute_base_url
end
@ -89,7 +85,8 @@ module FileStore
def cdn_url(url)
return url if SiteSetting.Upload.s3_cdn_url.blank?
schema = url[/^(https?:)?\/\//, 1]
url.sub("#{schema}#{absolute_base_url}", SiteSetting.Upload.s3_cdn_url)
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}/")
end
def cache_avatar(avatar, user_id)