Merge pull request #13209 from nextcloud/backport/13185/stable15

[stable15] SCSS cache buster is a combination of apps/theming/scc_vars
This commit is contained in:
Roeland Jago Douma 2018-12-22 10:36:08 +01:00 committed by GitHub
commit 5975f40f14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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));
}
}
}
}