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

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

Append cache bump parameter to scss files URL
pull/10465/head
Roeland Jago Douma 2018-08-01 13:28:53 +07:00 committed by GitHub
parent e65ca39993 6ce474518c
commit b5c5faebfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Template/SCSSCacher.php
Unescape Escape View File

@ -388,7 +388,11 @@ class SCSSCacher {
$fileName = array_pop($tmpfileLoc); $fileName = array_pop($tmpfileLoc);
$fileName = $this->prependVersionPrefix($this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName)), $appName); $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);
} }
/** /**

3
tests/lib/Template/SCSSCacherTest.php
Unescape Escape View File

@ -458,7 +458,8 @@ class SCSSCacherTest extends \Test\TestCase {
->with('core.Css.getCss', [ ->with('core.Css.getCss', [
'fileName' => substr(md5($version), 0, 4) . '-' . 'fileName' => substr(md5($version), 0, 4) . '-' .
substr(md5('http://localhost/nextcloud/index.php'), 0, 4) . '-styles.css', substr(md5('http://localhost/nextcloud/index.php'), 0, 4) . '-styles.css',
'appName' => $appName 'appName' => $appName,
'v' => 0,
]) ])
->willReturn(\OC::$WEBROOT . $result); ->willReturn(\OC::$WEBROOT . $result);
$actual = $this->scssCacher->getCachedSCSS($appName, $fileName); $actual = $this->scssCacher->getCachedSCSS($appName, $fileName);