diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-12-21 10:32:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 10:32:43 +0100 |
| commit | a8f611093a5933388fdd49ccacd8e70c3e96bd78 (patch) | |
| tree | 90e73dd871ac4e764da52135e3d5296c3cebf415 /lib/private | |
| parent | bb90e3d2d050f82b1a13f3867620700cb3cdd804 (diff) | |
| parent | 216ad29f05d5d527b7343ff4b764565d54c5a21a (diff) | |
| download | nextcloud-server-a8f611093a5933388fdd49ccacd8e70c3e96bd78.tar.gz nextcloud-server-a8f611093a5933388fdd49ccacd8e70c3e96bd78.zip | |
Merge pull request #13185 from nextcloud/fix/proper_version_theming_scss
SCSS cache buster is a combination of apps/theming/scc_vars
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/TemplateLayout.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index cbadf1df53f..284f14c5db4 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -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)); + } + } } } |