Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4279 from scossar/s3cdn-upload-location 

FIX: get urlWithCDN before appending protocol
This commit is contained in:
Sam 2016-06-29 12:18:44 +10:00 committed by GitHub
parent ef93e75f80 9bf381b95c
commit 7a4c3af29d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/lib/utilities.js
View File

@ -251,7 +251,8 @@ Discourse.Utilities = {
uploadLocation: function(url) { uploadLocation: function(url) {
if (Discourse.CDN) { if (Discourse.CDN) {
return Discourse.CDN.startsWith('//') ? "http:" + Discourse.getURLWithCDN(url) : Discourse.getURLWithCDN(url); url = Discourse.getURLWithCDN(url);
return url.startsWith('//') ? 'http:' + url : url;
} else if (Discourse.SiteSettings.enable_s3_uploads) { } else if (Discourse.SiteSettings.enable_s3_uploads) {
return 'https:' + url; return 'https:' + url;
} else { } else {