From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 22 Mar 2017 23:17:37 +0000 (-0600)
Subject: fix path for files from root folder
X-Git-Tag: v12.0.0beta1~331^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F3948%2Fhead;p=nextcloud-server.git

fix path for files from root folder

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---

diff --git a/apps/files_trashbin/lib/Helper.php b/apps/files_trashbin/lib/Helper.php
index faf84369e72..a309d533e54 100644
--- a/apps/files_trashbin/lib/Helper.php
+++ b/apps/files_trashbin/lib/Helper.php
@@ -91,7 +91,11 @@ class Helper {
 				'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE
 			);
 			if ($originalPath) {
-				$i['extraData'] = $originalPath . '/' . $originalName;
+				if ($originalPath !== '.') {
+					$i['extraData'] = $originalPath . '/' . $originalName;
+				} else {
+					$i['extraData'] = $originalName;
+				}
 			}
 			$result[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i, $mount);
 		}