diff options
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 6 | ||||
| -rw-r--r-- | tests/lib/Template/SCSSCacherTest.php | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index 6a41c4db8b9..19734355d26 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -388,7 +388,11 @@ class SCSSCacher { $fileName = array_pop($tmpfileLoc); $fileName = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName)), $appName); - return substr($this->urlGenerator->linkToRoute('core.Css.getCss', ['fileName' => $fileName, 'appName' => $appName]), strlen(\OC::$WEBROOT) + 1); + return substr($this->urlGenerator->linkToRoute('core.Css.getCss', [ + 'fileName' => $fileName, + 'appName' => $appName, + 'v' => $this->config->getAppValue('core', 'scss.variables', '0') + ]), \strlen(\OC::$WEBROOT) + 1); } /** diff --git a/tests/lib/Template/SCSSCacherTest.php b/tests/lib/Template/SCSSCacherTest.php index 2389d8ec881..d84b96773bc 100644 --- a/tests/lib/Template/SCSSCacherTest.php +++ b/tests/lib/Template/SCSSCacherTest.php @@ -458,7 +458,8 @@ class SCSSCacherTest extends \Test\TestCase { ->with('core.Css.getCss', [ 'fileName' => substr(md5($version), 0, 4) . '-' . substr(md5('http://localhost/nextcloud/index.php'), 0, 4) . '-styles.css', - 'appName' => $appName + 'appName' => $appName, + 'v' => 0, ]) ->willReturn(\OC::$WEBROOT . $result); $actual = $this->scssCacher->getCachedSCSS($appName, $fileName); |