[Pkg-owncloud-commits] [owncloud] 152/239: only create complete share key if we know the exact path

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 5d2299eab8bc11c814a0fc352fa65687a3711869
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Tue Nov 26 13:30:59 2013 +0100

    only create complete share key if we know the exact path
---
 apps/files_trashbin/lib/trashbin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 689a790..bb6bdd5 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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git