From 35b13b856b5ed2ab2c91a171b7c07b9fe60de721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Thu, 10 Nov 2016 16:22:03 +0100
Subject: [PATCH] Appdata location 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 | 4 ++--
lib/private/TemplateLayout.php | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 502088f1688..800b6b18bac 100755
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -72,10 +72,10 @@ class SCSSCacher {
$this->rootCssLoc = implode('/', $this->rootCssLoc);
try {
- $this->folder = $this->appData->getFolder('css');
+ $this->folder = $this->appData->getFolder('core');
} catch(NotFoundException $e) {
// creating css appdata folder
- $this->folder = $this->appData->newFolder('css');
+ $this->folder = $this->appData->newFolder('core');
}
}
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 96f612c313c..9711b0ff2f8 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -189,7 +189,9 @@ class TemplateLayout extends \OC_Template {
$theme,
array( \OC::$SERVERROOT => \OC::$WEBROOT ),
array( \OC::$SERVERROOT => \OC::$WEBROOT ),
- \OC::$server->getAppDataDir('server'));
+ \OC::$server->getAppDataDir('css'),
+ \OC::$server->getURLGenerator(),
+ \OC::$server->getSystemConfig());
$locator->find($styles);
return $locator->getResources();
}
--
GitLab