summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-09-14 13:29:57 +0200
committerGitHub <noreply@github.com>2017-09-14 13:29:57 +0200
commit545e9bc26b3e5bc9cd4f206e9d20fc87f5819494 (patch)
tree27ca6dc0e8b8d1e874414ed3c5680cd0f230ce83
parent7698781a1e47263c941533b42d2401092284b76b (diff)
parent1a0ac912b2aa001180ba20714fdbf2f44a4ca115 (diff)
downloadnextcloud-server-545e9bc26b3e5bc9cd4f206e9d20fc87f5819494.tar.gz
nextcloud-server-545e9bc26b3e5bc9cd4f206e9d20fc87f5819494.zip
Merge pull request #6495 from nextcloud/fix-webroot-throw-for-subdirectory-nc-installs
Fix webroot throw
-rw-r--r--lib/private/Template/CSSResourceLocator.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index e4b6890529e..c8a8c04ab47 100644
--- a/lib/private/Template/CSSResourceLocator.php
+++ b/lib/private/Template/CSSResourceLocator.php
@@ -129,7 +129,7 @@ class CSSResourceLocator extends ResourceLocator {
'throw' => $throw ? 'true' : 'false'
]);
- if ($throw) {
+ if ($throw && $root === '/') {
throw new ResourceNotFoundException($file, $webRoot);
}
}