From 7a282dee89d1b3036b7712911231dc71c06eaa55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Fri, 5 Jan 2018 08:34:32 +0100
Subject: [PATCH] Rollback caching fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 lib/private/Template/SCSSCacher.php | 7 ++++---
 1 file 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) {