github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 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 24dfa1b65790a350e7c8cca8bc3bf029982d7889.
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/assets/javascripts/discourse.js.es6
View File

@ -33,8 +33,8 @@ const Discourse = Ember.Application.extend({
// only relative urls
if (Discourse.CDN && /^\/[^\/]/.test(url)) {
url = Discourse.CDN + url;
} else if (Discourse.UploadCDN) {
url = url.replace(Discourse.UploadBaseUrl, Discourse.UploadCDN);
} else if (Discourse.S3CDN) {
url = url.replace(Discourse.S3BaseUrl, Discourse.S3CDN);
}
return url;
},