[Pkg-owncloud-commits] [owncloud] 36/457: removing deletion of encryption keys

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit d557519746c251e732855b0e6e5e4ea3ae4a7377
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Thu May 7 11:31:34 2015 -0400

    removing deletion of encryption keys
    
    this will be handled in the wrapper now
---
 apps/files_trashbin/lib/trashbin.php | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 35cb500..688eaa1 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

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