MDL-28147 do not double cache theme css/js

diff --git a/theme/javascript.php b/theme/javascript.php
index 983731b..5b29b57 100644 (file)
--- 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
index 2e99fe0..67420df 100644 (file)
--- 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,