Merge pull request #5252 from derkostka/master

Use realpath to obtain the webroot.
This commit is contained in:
Morris Jobke 2017-06-21 17:25:12 -05:00 committed by GitHub
commit 6a1c4990ab
2 changed files with 2 additions and 2 deletions

View File

@ -117,7 +117,7 @@ class CSSResourceLocator extends ResourceLocator {
parent::append($root, $file, $webRoot, $throw); parent::append($root, $file, $webRoot, $throw);
} else { } else {
if (!$webRoot) { if (!$webRoot) {
$tmpRoot = $root; $tmpRoot = realpath($root);
/* /*
* traverse the potential web roots upwards in the path * traverse the potential web roots upwards in the path
* *

View File

@ -125,7 +125,7 @@ abstract class ResourceLocator {
} }
if (!$webRoot) { if (!$webRoot) {
$tmpRoot = $root; $tmpRoot = realpath($root);
/* /*
* traverse the potential web roots upwards in the path * traverse the potential web roots upwards in the path
* *