summaryrefslogtreecommitdiffstats
path: root/lib/private/Template
diff options
context:
space:
mode:
authorAxel Helmert <axel.helmert@luka.de>2017-09-12 12:14:27 +0200
committerAxel Helmert <axel.helmert@luka.de>2017-09-12 12:14:27 +0200
commit01d496713058e9ac44bda188a4334b7081ac7ce8 (patch)
tree30fa4e3e0e3c9110de697ae185fc87de51d36f09 /lib/private/Template
parent88731848c609a454aa90a533e7361bca5f4e66b8 (diff)
downloadnextcloud-server-01d496713058e9ac44bda188a4334b7081ac7ce8.tar.gz
nextcloud-server-01d496713058e9ac44bda188a4334b7081ac7ce8.zip
Fix undefined variable $tmpRoot
Refactoring of webroot detection left an unused variable. Fixes: #6415 Signed-off-by: Axel Helmert <info@luka.de>
Diffstat (limited to 'lib/private/Template')
-rw-r--r--lib/private/Template/CSSResourceLocator.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 1b4050e4ae0..e4b6890529e 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -128,14 +128,14 @@ class CSSResourceLocator extends ResourceLocator {
'webRoot' => $webRoot,
'throw' => $throw ? 'true' : 'false'
]);
- }
- }
- if ($throw && $tmpRoot === '/') {
- throw new ResourceNotFoundException($file, $webRoot);
+ if ($throw) {
+ throw new ResourceNotFoundException($file, $webRoot);
+ }
+ }
}
- $this->resources[] = array($tmpRoot, $webRoot, $file);
+ $this->resources[] = array($webRoot? : '/', $webRoot, $file);
}
}
}