diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-12 20:55:24 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-05-12 20:55:24 +0200 |
| commit | 408189b7e48ba3a738339ed3cb5fe6e376a8c94b (patch) | |
| tree | e3d1e63a0855e7f819f1d1db30f24295d1068871 /apps/files_trashbin | |
| parent | aea44ee0d567e3f97aa25a9037db129b2c5fa645 (diff) | |
| parent | f5ed92bf31f98d6dbdd7bbc7903169c90d82e464 (diff) | |
| download | nextcloud-server-408189b7e48ba3a738339ed3cb5fe6e376a8c94b.tar.gz nextcloud-server-408189b7e48ba3a738339ed3cb5fe6e376a8c94b.zip | |
Merge pull request #8556 from owncloud/kill-legacy-code-master
Kill legacy code master
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 173eb2164cf..e2f220051c7 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -216,7 +216,7 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($file_path); - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user); // disable proxy to prevent recursive calls $proxyStatus = \OC_FileProxy::$enabled; @@ -441,7 +441,7 @@ class Trashbin { list($owner, $ownerPath) = self::getUidAndFilename($target); - $util = new \OCA\Encryption\Util(new \OC_FilesystemView('/'), $user); + $util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user); if ($util->isSystemWideMountPoint($ownerPath)) { $baseDir = '/files_encryption/'; @@ -498,7 +498,7 @@ class Trashbin { $rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey'); // try to re-share if file is shared - $filesystemView = new \OC_FilesystemView('/'); + $filesystemView = new \OC\Files\View('/'); $session = new \OCA\Encryption\Session($filesystemView); $util = new \OCA\Encryption\Util($filesystemView, $user); |