diff options
| author | Sebastian Kostka <sebastian.kostka@gmail.com> | 2017-06-20 22:06:31 +0200 |
|---|---|---|
| committer | Sebastian Kostka <sebastian.kostka@gmail.com> | 2017-06-20 22:15:20 +0200 |
| commit | c7ce42e45b26554594562ed4c5025a74af85d442 (patch) | |
| tree | d181eebab7c654815821a462b8cff77994eee40e | |
| parent | f901861f811e634e3f05f45d008be2258288cec7 (diff) | |
| download | nextcloud-server-c7ce42e45b26554594562ed4c5025a74af85d442.tar.gz nextcloud-server-c7ce42e45b26554594562ed4c5025a74af85d442.zip | |
Squashed the webroot fix
Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
| -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 * |