From 1af28cefe8ba9e6d1f47ec3e8163debcd5598d37 Mon Sep 17 00:00:00 2001
From: Toby Lawrence <tlawrence@edx.org>
Date: Fri, 25 Mar 2016 13:22:36 -0400
Subject: [PATCH] Revert "Only require a module once."

This reverts commit 76c0c0413de55a8865faaf60bbdfae0e76d52641.
---
 .../templates/static_content.html              | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/common/djangoapps/pipeline_mako/templates/static_content.html b/common/djangoapps/pipeline_mako/templates/static_content.html
index 6b32456e54..20e527f5c9 100644
--- a/common/djangoapps/pipeline_mako/templates/static_content.html
+++ b/common/djangoapps/pipeline_mako/templates/static_content.html
@@ -70,9 +70,21 @@ source, template_path = Loader(engine).load_template_source(path)
 <%def name="require_module(module_name, class_name)">
     <script type="text/javascript">
         (function (require) {
-            require(['${module_name}'], function (${class_name}) {
-                ${caller.body()}
-            });
+            % if settings.REQUIRE_DEBUG:
+                require(['${module_name}'], function (${class_name}) {
+                    ${caller.body()}
+                });
+            % else:
+                ## The "raw" parameter is specified to avoid the URL from being further maninpulated by
+                ## static_replace calls (as woudl happen if require_module is used within courseware).
+                ## Without specifying "raw", a call to static_replace would result in the MD5 hash being
+                ## being appended more than once, causing the import to fail in production environments.
+                require(['${staticfiles_storage.url(module_name + ".js") + "?raw"}'], function () {
+                    require(['${module_name}'], function (${class_name}) {
+                        ${caller.body()}
+                    });
+                });
+            % endif
         }).call(this, require || RequireJS.require);
     </script>
 </%def>