Merge pull request #10484 from nextcloud/bugfix/noid/theming-cache-up…

…date Append cache bump parameter to scss files URL
nextcloud · Aug 1, 2018 · b5c5fae · b5c5fae
2 parents e65ca39 + 6ce4745
commit b5c5fae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
@@ -388,7 +388,11 @@ public function getCachedSCSS(string $appName, string $fileName): string {
 		$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
@@ -458,7 +458,8 @@ public function testGetCachedSCSS($appName, $fileName, $result, $version) {
 			->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);