From 3a0b23191ceb27358817b1d1389e06de0fb309ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Fri, 16 May 2014 15:11:12 +0200
Subject: [PATCH] TEMP: disable CORS when using CDN

---
 app/helpers/application_helper.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b6c5f2aa8ed..86231a8b035 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -14,11 +14,12 @@ module ApplicationHelper
   def script(*args)
     # This crazy stuff is needed to get window.onerror working under a CDN
     # NGINX change is also required and baked into sample config
-    if GlobalSetting.cdn_url
-      javascript_include_tag(*args, "crossorigin" => "anonymous")
-    else
+    # @sam: disabling this until we update our CDN configuration
+    #if GlobalSetting.cdn_url
+    #  javascript_include_tag(*args, "crossorigin" => "anonymous")
+    #else
       javascript_include_tag(*args)
-    end
+    #end
   end
 
   def discourse_csrf_tags