From f86b5c2ebba9aaa76bbcc1dfc660f430b246d1a4 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 10 Mar 2017 20:00:34 +0100
Subject: Properly calculate webdir using the serverroot

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/Template/SCSSCacher.php | 15 +++++++++++----
 lib/private/TemplateLayout.php      |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index 744ea80761e..b55cd0b93b0 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -46,17 +46,26 @@ class SCSSCacher {
 	/** @var SystemConfig */
 	protected $systemConfig;
 
+	/** @var string */
+	protected $serverRoot;
+
 	/**
 	 * @param ILogger $logger
 	 * @param IAppData $appData
 	 * @param IURLGenerator $urlGenerator
 	 * @param SystemConfig $systemConfig
+	 * @param string $serverRoot
 	 */
-	public function __construct(ILogger $logger, IAppData $appData, IURLGenerator $urlGenerator, SystemConfig $systemConfig) {
+	public function __construct(ILogger $logger,
+								IAppData $appData,
+								IURLGenerator $urlGenerator,
+								SystemConfig $systemConfig,
+								$serverRoot) {
 		$this->logger = $logger;
 		$this->appData = $appData;
 		$this->urlGenerator = $urlGenerator;
 		$this->systemConfig = $systemConfig;
+		$this->serverRoot = $serverRoot;
 	}
 
 	/**
@@ -74,9 +83,7 @@ class SCSSCacher {
 
 		$path = implode('/', $path);
 
-		$webDir = explode('/', $file);
-		array_pop($webDir);
-		$webDir = implode('/', $webDir);
+		$webDir = substr($path, strlen($this->serverRoot)+1);
 
 		try {
 			$folder = $this->appData->getFolder($app);
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index ccd53c9cafa..680bfbbfec1 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -216,7 +216,8 @@ class TemplateLayout extends \OC_Template {
 				\OC::$server->getLogger(),
 				\OC::$server->getAppDataDir('css'),
 				\OC::$server->getURLGenerator(),
-				\OC::$server->getSystemConfig()
+				\OC::$server->getSystemConfig(),
+				\OC::$SERVERROOT
 			);
 		} else {
 			$SCSSCacher = null;
-- 
cgit v1.2.3