aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/Template/ResourceLocator.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-06-21 17:25:12 -0500
committerGitHub <noreply@github.com>2017-06-21 17:25:12 -0500
commit6a1c4990abdd0c55b24bf3699e6059763d6f3040 (patch)
tree6b17e91ccb59ca1fb6ed4acf33316066f1c51291 /lib/private/Template/ResourceLocator.php
parent146c699eb49e05c499bf6673f85a948aecceec97 (diff)
parentc7ce42e45b26554594562ed4c5025a74af85d442 (diff)
downloadnextcloud-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/ResourceLocator.php')
-rwxr-xr-xlib/private/Template/ResourceLocator.php2
1 files changed, 1 insertions, 1 deletions
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
*