From c7ce42e45b26554594562ed4c5025a74af85d442 Mon Sep 17 00:00:00 2001 From: Sebastian Kostka Date: Tue, 20 Jun 2017 22:06:31 +0200 Subject: Squashed the webroot fix Signed-off-by: Sebastian Kostka --- lib/private/Template/CSSResourceLocator.php | 2 +- lib/private/Template/ResourceLocator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/private/Template') 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 * -- cgit v1.2.3