upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-20 22:00:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Fix "webroot not found" when installed to the root of the webserver

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2017-09-19 17:08:30 +02:00
parent 1995c69928
commit 5430d73a0e
No known key found for this signature in database
GPG key ID: CBCA68FBAEBF98C9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/private/Template/CSSResourceLocator.php
View file

@ -119,7 +119,7 @@ class CSSResourceLocator extends ResourceLocator {
if (!$webRoot) {
$webRoot = $this->findWebRoot($root);
if (!$webRoot) {
if ($webRoot === null) {
$webRoot = '';
$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
'app' => 'lib',

6
lib/private/Template/ResourceLocator.php
View file

@ -139,7 +139,7 @@ abstract class ResourceLocator {
$tmpRoot = dirname($tmpRoot);
}
if (!$webRoot) {
if ($webRoot === null) {
$realpath = realpath($root);
if ($realpath && ($realpath !== $root)) {
@ -168,10 +168,10 @@ abstract class ResourceLocator {
return;
}
if (!$webRoot) {
if ($webRoot === null) {
$webRoot = $this->findWebRoot($root);
if (!$webRoot) {
if ($webRoot === null) {
$webRoot = '';
$this->logger->error('ResourceLocator can not find a web root (root: {root}, file: {file}, webRoot: {webRoot}, throw: {throw})', [
'app' => 'lib',