Merge pull request #5507 from derkostka/stable12

[stable12] Use realpath to obtain the webroot
nextcloud · Jun 23, 2017 · 8550fdf · 8550fdf
2 parents cb9a6a8 + f0753cb
commit 8550fdf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php
@@ -117,7 +117,7 @@ public function append($root, $file, $webRoot = null, $throw = true, $scss = fal
 			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
@@ -125,7 +125,7 @@ protected function append($root, $file, $webRoot = null, $throw = true) {
 		}
 
 		if (!$webRoot) {
-			$tmpRoot = $root;
+			$tmpRoot = realpath($root);
 			/*
 			 * traverse the potential web roots upwards in the path
 			 *