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

FIX: theme-javascripts using incorrect subfolder setting

Browse Source
This commit is contained in:
Kane York
2020-03-05 12:34:11 -08:00
committed by Kane York
parent e2ce12d414
commit ccc9b64a99
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/javascript_cache.rb
View File

@@ -8,7 +8,7 @@ class JavascriptCache < ActiveRecord::Base
before_save :update_digest before_save :update_digest
def url def url
"#{GlobalSetting.cdn_url}#{GlobalSetting.relative_url_root}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}" "#{GlobalSetting.cdn_url}#{Discourse.base_uri}/theme-javascripts/#{digest}.js?__ws=#{Discourse.current_hostname}"
end end
private private

2
lib/content_security_policy/default.rb
View File

@@ -36,7 +36,7 @@ class ContentSecurityPolicy
if can_use_s3_cdn && s3_cdn if can_use_s3_cdn && s3_cdn
s3_cdn + dir s3_cdn + dir
elsif can_use_cdn && cdn elsif can_use_cdn && cdn
cdn + dir cdn + Discourse.base_uri + dir
else else
base + dir base + dir
end end