From e1c2a211f259821910be2cba23679d4176fb00a3 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Mon, 4 Jul 2011 11:29:23 +0200 Subject: [PATCH] MDL-28147 do not double cache theme css/js --- theme/javascript.php | 5 ++--- theme/styles.php | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/theme/javascript.php b/theme/javascript.php index 983731b30da..5b29b5742a5 100644 --- 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 2e99fe07672..67420df130b 100644 --- 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,