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 "Rename s3 vars, change condition when displaying s3 uploads"

Browse Source 
The new variables do not reflect that they represent S3 settings.

This reverts commit 24dfa1b657.
This commit is contained in:
Guo Xiang Tan
2018-07-06 15:46:41 +08:00
parent 4f41ccd975
commit 73e30ff4c2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,9 +56,9 @@
Discourse.HighlightJSPath = <%= HighlightJs.path.inspect.html_safe %>;
<%- if SiteSetting.Upload.enable_s3_uploads %>
<%- if SiteSetting.Upload.s3_cdn_url.present? %>
Discourse.UploadCDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
Discourse.S3CDN = '<%= SiteSetting.Upload.s3_cdn_url %>';
<%- end %>
Discourse.UploadBaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
Discourse.S3BaseUrl = '<%= SiteSetting.Upload.absolute_base_url %>';
<%- end %>
})();
</script>