summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-11-26 13:30:59 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-11-26 13:30:59 +0100
commit5d2299eab8bc11c814a0fc352fa65687a3711869 (patch)
tree63f601e47ee299c1e5baf75a3e7d9d2485eb37d3
parentf8fcd567a71bee0e6ccd53315a302f904b2a61a0 (diff)
downloadnextcloud-server-5d2299eab8bc11c814a0fc352fa65687a3711869.tar.gz
nextcloud-server-5d2299eab8bc11c814a0fc352fa65687a3711869.zip
only create complete share key if we know the exact path
-rw-r--r--apps/files_trashbin/lib/trashbin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 689a790d863..bb6bdd547a0 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -502,7 +502,6 @@ class Trashbin {
if ($timestamp) {
$keyfile .= '.d' . $timestamp;
- $sharekey .= '.d' . $timestamp;
}
// disable proxy to prevent recursive calls
@@ -518,6 +517,9 @@ class Trashbin {
$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
// handle share-keys
+ if ($timestamp) {
+ $sharekey .= '.d' . $timestamp;
+ }
$size += self::calculateSize(new \OC\Files\View($sharekey));
$rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
} else {