discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 03:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Discourse.S3BaseUrl did not account for subfolder bucket names.

Browse Source
This commit is contained in:
Guo Xiang Tan 2018-07-06 15:52:23 +08:00
parent 73e30ff4c2
commit 875008522d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/site_setting.rb
View File

@ -132,6 +132,11 @@ class SiteSetting < ActiveRecord::Base
SiteSetting.enable_s3_uploads || GlobalSetting.use_s3?
end
def self.s3_base_url
path = self.s3_upload_bucket.split("/", 2)[1]
"#{self.absolute_base_url}#{path ? '/' + path : ''}"
end
def self.absolute_base_url
bucket = SiteSetting.enable_s3_uploads ? Discourse.store.s3_bucket_name : GlobalSetting.s3_bucket_name

4
app/models/upload.rb
View File

@ -84,11 +84,9 @@ class Upload < ActiveRecord::Base
# when using s3, we need to replace with the absolute base url
if SiteSetting.Upload.s3_cdn_url.present?
path = Discourse.store.s3_bucket.split("/", 2)[1]
url = url.sub(
SiteSetting.Upload.s3_cdn_url,
"#{Discourse.store.absolute_base_url}#{path ? '/' + path : ''}"
SiteSetting.Upload.s3_base_url
)
end

2
app/views/common/_discourse_javascript.html.erb
View File

@ -58,7 +58,7 @@
<%- if SiteSetting.Upload.s3_cdn_url.present? %>
Discourse.S3CDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
<%- end %>
Discourse.S3BaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
Discourse.S3BaseUrl = '<%= SiteSetting.Upload.s3_base_url %>';
<%- end %>
})();
</script>