mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-28147 do not double cache theme css/js
This commit is contained in:
parent
81f8e0f8a0
commit
e1c2a211f2
2 changed files with 4 additions and 4 deletions
|
@ -118,12 +118,11 @@ function send_uncached_js($js) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function minify($files) {
|
function minify($files) {
|
||||||
global $CFG;
|
|
||||||
|
|
||||||
if (0 === stripos(PHP_OS, 'win')) {
|
if (0 === stripos(PHP_OS, 'win')) {
|
||||||
Minify::setDocRoot(); // IIS may need help
|
Minify::setDocRoot(); // IIS may need help
|
||||||
}
|
}
|
||||||
Minify::setCache('', true);
|
// disable all caching, we do it in moodle
|
||||||
|
Minify::setCache(null, false);
|
||||||
|
|
||||||
$options = array(
|
$options = array(
|
||||||
'bubbleCssImports' => false,
|
'bubbleCssImports' => false,
|
||||||
|
|
|
@ -160,7 +160,8 @@ function minify($files) {
|
||||||
if (0 === stripos(PHP_OS, 'win')) {
|
if (0 === stripos(PHP_OS, 'win')) {
|
||||||
Minify::setDocRoot(); // IIS may need help
|
Minify::setDocRoot(); // IIS may need help
|
||||||
}
|
}
|
||||||
Minify::setCache('', true);
|
// disable all caching, we do it in moodle
|
||||||
|
Minify::setCache(null, false);
|
||||||
|
|
||||||
$options = array(
|
$options = array(
|
||||||
'bubbleCssImports' => false,
|
'bubbleCssImports' => false,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue