diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-21 17:25:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 17:25:12 -0500 |
| commit | 6a1c4990abdd0c55b24bf3699e6059763d6f3040 (patch) | |
| tree | 6b17e91ccb59ca1fb6ed4acf33316066f1c51291 /lib/private/Template | |
| parent | 146c699eb49e05c499bf6673f85a948aecceec97 (diff) | |
| parent | c7ce42e45b26554594562ed4c5025a74af85d442 (diff) | |
| download | nextcloud-server-6a1c4990abdd0c55b24bf3699e6059763d6f3040.tar.gz nextcloud-server-6a1c4990abdd0c55b24bf3699e6059763d6f3040.zip | |
Merge pull request #5252 from derkostka/master
Use realpath to obtain the webroot.
Diffstat (limited to 'lib/private/Template')
| -rw-r--r-- | lib/private/Template/CSSResourceLocator.php | 2 | ||||
| -rwxr-xr-x | lib/private/Template/ResourceLocator.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 0150449ac9f..32dabb48c0d 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -117,7 +117,7 @@ class CSSResourceLocator extends ResourceLocator { parent::append($root, $file, $webRoot, $throw); } else { if (!$webRoot) { - $tmpRoot = $root; + $tmpRoot = realpath($root); /* * traverse the potential web roots upwards in the path * diff --git a/lib/private/Template/ResourceLocator.php b/lib/private/Template/ResourceLocator.php index 4e733d28f26..f721906e12b 100755 --- a/lib/private/Template/ResourceLocator.php +++ b/lib/private/Template/ResourceLocator.php @@ -125,7 +125,7 @@ abstract class ResourceLocator { } if (!$webRoot) { - $tmpRoot = $root; + $tmpRoot = realpath($root); /* * traverse the potential web roots upwards in the path * |