MDL-28147 do not double cache theme css/js

moodle · Jul 4, 2011 · e1c2a21 · e1c2a21
1 parent 81f8e0f
commit e1c2a21
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/theme/javascript.php b/theme/javascript.php
@@ -118,12 +118,11 @@ function send_uncached_js($js) {
 }
 
 function minify($files) {
-    global $CFG;
-
     if (0 === stripos(PHP_OS, 'win')) {
         Minify::setDocRoot(); // IIS may need help
     }
-    Minify::setCache('', true);
+    // disable all caching, we do it in moodle
+    Minify::setCache(null, false);
 
     $options = array(
         'bubbleCssImports' => false,

diff --git a/theme/styles.php b/theme/styles.php
@@ -160,7 +160,8 @@ function minify($files) {
     if (0 === stripos(PHP_OS, 'win')) {
         Minify::setDocRoot(); // IIS may need help
     }
-    Minify::setCache('', true);
+    // disable all caching, we do it in moodle
+    Minify::setCache(null, false);
 
     $options = array(
         'bubbleCssImports' => false,