sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCSS cache buster is a combination of apps/theming/scc_vars 

Else on scss files we'd get <file>?v=<hash>?v=<hash2>
This is of course not valid. Now it becomes <file>?v=<hash>-<hash2>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/13209/head
Roeland Jago Douma 2018-12-20 20:33:21 +07:00 committed by Backportbot
parent 6a618ebd8b
commit 77a81d00cf
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/TemplateLayout.php
Unescape Escape View File

@ -210,7 +210,14 @@ class TemplateLayout extends \OC_Template {
if (substr($file, -strlen('print.css')) === 'print.css') {
$this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
} else {
$this->append( 'cssfiles', $web.'/'.$file . $this->getVersionHashSuffix($web, $file) );
$suffix = $this->getVersionHashSuffix($web, $file);
if (strpos($file, '?v=') == false) {
$this->append( 'cssfiles', $web.'/'.$file . $suffix);
} else {
$this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
}
}
}
}