From eaa896d8eeedbdd28637824cdb26ebf7ef983bc5 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 3 Oct 2017 11:20:08 +1100
Subject: [PATCH] FIX: not serving non brotli cdns from cdn_url

(this means that access control allow origin could break)
---
 app/helpers/application_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e7d1e7864ec..7aa875341c3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -60,6 +60,8 @@ module ApplicationHelper
         ENV["COMPRESS_BROTLI"] == "1" &&
         request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
       path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/brotli_asset/")
+    elsif GlobalSetting.cdn_url
+      path.gsub!("#{GlobalSetting.cdn_url}/assets/", "#{GlobalSetting.cdn_url}/cdn_asset/")
     end
 "<link rel='preload' href='#{path}' as='script'/>
 <script src='#{path}'></script>".html_safe