[stable12] Use realpath to obtain the webroot

Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com

diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
index 0150449ac9f7ebe2450b8e1133341e3ce113b0b4..32dabb48c0d8c96f3e849054ed9b1df60e52fc51 100644 (file)
--- 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 4e733d28f266da875bc268682786cd83cad662ee..f721906e12ba32ea79304148485ee7631a857bbc 100755 (executable)
--- 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
                         *