diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-23 11:21:06 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-23 11:21:06 +0100 |
| commit | 5352b4b2b83c5f141f68194c77c239753da30b9e (patch) | |
| tree | 219b2f87aa788b7660cd5b4081d0f251757ba91a | |
| parent | d8f04f5a97e77bf5fb84b05ddd9b3a476fecfb7c (diff) | |
| parent | 07d5725de2aa597f41bfc25f676af935b60a52be (diff) | |
| download | nextcloud-server-5352b4b2b83c5f141f68194c77c239753da30b9e.tar.gz nextcloud-server-5352b4b2b83c5f141f68194c77c239753da30b9e.zip | |
Merge pull request #10292 from owncloud/external-share-delete
Fix trashbin when deleting a file over an external share
| -rw-r--r-- | apps/files_sharing/publicwebdav.php | 1 | ||||
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php index 2c7ccf8d92c..240891ffef6 100644 --- a/apps/files_sharing/publicwebdav.php +++ b/apps/files_sharing/publicwebdav.php @@ -54,7 +54,6 @@ $server->subscribeEvent('beforeMethod', function () use ($server, $objectTree, $ $ownerView = \OC\Files\Filesystem::getView(); $path = $ownerView->getPath($fileId); - $view = new \OC\Files\View($ownerView->getAbsolutePath($path)); $rootInfo = $view->getFileInfo(''); diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 952af56bacc..26257bd3817 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -22,6 +22,8 @@ namespace OCA\Files_Trashbin; +use OC\Files\Filesystem; + class Trashbin { // how long do we keep files in the trash bin if no other value is defined in the config file (unit: days) @@ -136,7 +138,9 @@ class Trashbin { * @param string $file_path path to the deleted file/directory relative to the files root directory */ public static function move2trash($file_path) { - $user = \OCP\User::getUser(); + // get the user for which the filesystem is setup + $root = Filesystem::getRoot(); + list(, $user) = explode('/', $root); $size = 0; list($owner, $ownerPath) = self::getUidAndFilename($file_path); |