github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 08:42:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

get urlWithCDN before appending protocol

Browse Source
This commit is contained in:
scossar 2016-06-20 14:03:24 -07:00
parent 2720205f78
commit 9bf381b95c
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) {
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) {
return 'https:' + url;
} else {