aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-12-27 11:01:27 +0100
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-12-30 05:55:44 +0100
commit89ca9cb35cb62d603370e6424c83886da00342aa (patch)
tree870be07d5f733494b9b410001d77e8188ddae017 /lib
parentfb6c5cc41618a476fc2ac47fb0f4fd137029ec62 (diff)
downloadnextcloud-server-89ca9cb35cb62d603370e6424c83886da00342aa.tar.gz
nextcloud-server-89ca9cb35cb62d603370e6424c83886da00342aa.zip
Fixed webroot for scss files
Fixed tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Template/CSSResourceLocator.php4
-rw-r--r--lib/private/Template/SCSSCacher.php16
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 3c30a9d3356..5ca05d1b953 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -108,7 +108,7 @@ class CSSResourceLocator extends ResourceLocator {
if($this->scssCacher !== null) {
if($this->scssCacher->process($root, $file, $app)) {
- $this->append($root, $this->scssCacher->getCachedSCSS($app, $file), false, true, true);
+ $this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true);
return true;
} else {
$this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']);
@@ -145,7 +145,7 @@ class CSSResourceLocator extends ResourceLocator {
}
}
- $this->resources[] = array($webRoot? : '/', $webRoot, $file);
+ $this->resources[] = array($webRoot? : \OC::$WEBROOT, $webRoot, $file);
}
}
}
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index d7e2441f412..eb3636a1897 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -102,16 +102,19 @@ class SCSSCacher {
$fileNameCSS = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileNameSCSS));
$path = implode('/', $path);
+ $webDir = null;
// Detect if path is within an app path
$app_paths = $this->config->getSystemValue('apps_paths');
- foreach ($app_paths as $app_path) {
- if(strpos($path, $app_path["path"]) === 0) {
- $webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
- break;
+ if (!empty($app_paths)) {
+ foreach ($app_paths as $app_path) {
+ if (strpos($path, $app_path["path"]) === 0) {
+ $webDir = $app_path["url"].str_replace($app_path["path"], '', $path);
+ break;
+ }
}
}
- if(is_null($webDir)) {
+ if (is_null($webDir)) {
$webDir = substr($path, strlen($this->serverRoot));
}
@@ -165,7 +168,7 @@ class SCSSCacher {
}
}
}
- return false;
+ return true;
} catch(NotFoundException $e) {
return false;
}
@@ -304,7 +307,6 @@ class SCSSCacher {
* @return string
*/
public function getCachedSCSS($appName, $fileName) {
- //var_dump([$appName, $fileName]);
$tmpfileLoc = explode('/', $fileName);
$fileName = array_pop($tmpfileLoc);
$fileName = $this->prependBaseurlPrefix(str_replace('.scss', '.css', $fileName));