Use realpath to resolve symplinks

owncloud · Jul 26, 2014 · 8749296 · 8749296
1 parent e53541d
commit 8749296
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/location.php b/lib/location.php
@@ -115,7 +115,7 @@ protected function toAbsolute($base, $pathArray) {
 		foreach ($pathArray as $path) {
 			// There is a little sense to make these entries absolute
 			if (!in_array($path, array('.', '..'))) {
-				$result [$path] = $base . '/' . $path;
+				$result [$path] = realpath($base . '/' . $path);
 			}
 		}
 		return $result;

diff --git a/lib/location/core.php b/lib/location/core.php
@@ -34,9 +34,9 @@ public function check() {
 
 	protected function filterOld($pathArray) {
 		$skip = array_values(Helper::getDirectories());
-		$skip[] = rtrim(App::getBackupBase(), '/');
-		$skip[] = \OCP\Config::getSystemValue("datadirectory", \OC::$SERVERROOT . "/data");
-		$skip[] = rtrim(App::getTempBase(), '/');
+		$skip[] = realpath(App::getBackupBase());
+		$skip[] = realpath(\OCP\Config::getSystemValue("datadirectory", \OC::$SERVERROOT . "/data"));
+		$skip[] = realpath(App::getTempBase());
 
 		// Skip 3rdparty | apps | backup | datadir | config | themes
 		foreach ($pathArray as $key => $path) {