only create complete share key if we know the exact path
This commit is contained in:
parent
f8fcd567a7
commit
5d2299eab8
|
@ -502,7 +502,6 @@ class Trashbin {
|
||||||
|
|
||||||
if ($timestamp) {
|
if ($timestamp) {
|
||||||
$keyfile .= '.d' . $timestamp;
|
$keyfile .= '.d' . $timestamp;
|
||||||
$sharekey .= '.d' . $timestamp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// disable proxy to prevent recursive calls
|
// disable proxy to prevent recursive calls
|
||||||
|
@ -518,6 +517,9 @@ class Trashbin {
|
||||||
$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
|
$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
|
||||||
|
|
||||||
// handle share-keys
|
// handle share-keys
|
||||||
|
if ($timestamp) {
|
||||||
|
$sharekey .= '.d' . $timestamp;
|
||||||
|
}
|
||||||
$size += self::calculateSize(new \OC\Files\View($sharekey));
|
$size += self::calculateSize(new \OC\Files\View($sharekey));
|
||||||
$rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
|
$rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue