[Pkg-owncloud-commits] [owncloud] 31/34: make sure that trash bin is initialized for both the current user and the file owner

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.6
in repository owncloud.

commit 9320225daaa2d8f5c4ddd927a8cd4c0e8e04cbf0
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Oct 22 15:14:30 2014 +0200

    make sure that trash bin is initialized for both the current user and the file owner
---
 apps/files_trashbin/lib/trashbin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 2537c9e..e0c158a 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -104,6 +104,9 @@ class Trashbin {
 		}
 
 		self::setUpTrash($user);
+		if ($owner !== $user) {
+			self::setUpTrash($owner);
+		}
 
 		$view = new \OC\Files\View('/' . $user);
 		$path_parts = pathinfo($file_path);

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