Merge pull request #6495 from nextcloud/fix-webroot-throw-for-subdirectory-nc-installs

MorrisJobke · web-flow · commit 545e9bc26b3e · 2017-09-14T13:29:57.000+02:00
Fix webroot throw
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
@@ -129,7 +129,7 @@ public function append($root, $file, $webRoot = null, $throw = true, $scss = fal
 						'throw' => $throw ? 'true' : 'false'
 					]);
 
-					if ($throw) {
+					if ($throw && $root === '/') {
 						throw new ResourceNotFoundException($file, $webRoot);
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public function append($root, $file, $webRoot = null, $throw = true, $scss = fal`
`129`	`129`	`'throw' => $throw ? 'true' : 'false'`
`130`	`130`	`]);`
`131`	`131`
`132`		`- if ($throw) {`
	`132`	`+ if ($throw && $root === '/') {`
`133`	`133`	`throw new ResourceNotFoundException($file, $webRoot);`
`134`	`134`	`}`
`135`	`135`	`}`