aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-22 17:17:37 -0600
committerMorris Jobke <hey@morrisjobke.de>2017-03-22 17:17:37 -0600
commitfb87aa61e7154acbdcc5f93fed0331bd3c4da990 (patch)
tree74f95af3b35aba41bd33caa1440327233a6f9c43 /apps
parent17bed297dba2d46ee66696d6a76257fd3bea733b (diff)
downloadnextcloud-server-fb87aa61e7154acbdcc5f93fed0331bd3c4da990.tar.gz
nextcloud-server-fb87aa61e7154acbdcc5f93fed0331bd3c4da990.zip
fix path for files from root folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_trashbin/lib/Helper.php6
1 files changed, 5 insertions, 1 deletions
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);
}