diff options
| author | Clark Tomlinson <fallen013@gmail.com> | 2015-05-07 11:31:34 -0400 |
|---|---|---|
| committer | Clark Tomlinson <fallen013@gmail.com> | 2015-05-18 09:47:46 -0400 |
| commit | d557519746c251e732855b0e6e5e4ea3ae4a7377 (patch) | |
| tree | 3c06685663405cb217fc0b1f77602a900eba8c9f /apps | |
| parent | a0c6c01137a707aab58622dbfc0dba76661386da (diff) | |
| download | nextcloud-server-d557519746c251e732855b0e6e5e4ea3ae4a7377.tar.gz nextcloud-server-d557519746c251e732855b0e6e5e4ea3ae4a7377.zip | |
removing deletion of encryption keys
this will be handled in the wrapper now
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index 35cb50097e0..688eaa1f2cb 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -425,7 +425,6 @@ class Trashbin { } $size += self::deleteVersions($view, $file, $filename, $timestamp, $user); - $size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp, $user); if ($view->is_dir('/files_trashbin/files/' . $file)) { $size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file)); @@ -468,31 +467,6 @@ class Trashbin { } /** - * @param \OC\Files\View $view - * @param $file - * @param $filename - * @param $timestamp - * @return int - */ - private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) { - $size = 0; - if (\OCP\App::isEnabled('encryption')) { - - $keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename); - - if ($timestamp) { - $keyfiles .= '.d' . $timestamp; - } - if ($view->is_dir($keyfiles)) { - $size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfiles)); - $view->deleteAll($keyfiles); - - } - } - return $size; - } - - /** * check to see whether a file exists in trashbin * * @param string $filename path to the file |