Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MDL-28147 do not double cache theme css/js

  • Loading branch information...
commit 05f4555422278190ec24a88466ac43c914a7e5d6 1 parent a5dd15e
@skodak skodak authored stronk7 committed
Showing with 4 additions and 4 deletions.
  1. +2 −3 theme/javascript.php
  2. +2 −1  theme/styles.php
View
5 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,
View
3  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,
Please sign in to comment.
Something went wrong with that request. Please try again.