aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-01-05 08:34:32 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2018-01-05 08:34:32 +0100
commit7a282dee89d1b3036b7712911231dc71c06eaa55 (patch)
tree269b20a2fa461c14d3bc1eb2aa2dd6584b8768a8 /lib
parent7bc63f6135f6f6dfdd418757d446ca810dfd5abf (diff)
downloadnextcloud-server-7a282dee89d1b3036b7712911231dc71c06eaa55.tar.gz
nextcloud-server-7a282dee89d1b3036b7712911231dc71c06eaa55.zip
Rollback caching fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Template/SCSSCacher.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index e27f5aed857..09c7f604273 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -111,6 +111,10 @@ class SCSSCacher {
$folder = $this->appData->newFolder($app);
}
+ if(!$this->variablesChanged() && $this->isCached($fileNameCSS, $folder)) {
+ return true;
+ }
+
return $this->cache($path, $fileNameCSS, $fileNameSCSS, $folder, $webDir);
}
@@ -131,9 +135,6 @@ class SCSSCacher {
* @return boolean
*/
private function isCached($fileNameCSS, ISimpleFolder $folder) {
- if ($this->variablesChanged()) {
- return false;
- }
try {
$cachedFile = $folder->getFile($fileNameCSS);
if ($cachedFile->getSize() > 0) {