diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-17 11:20:17 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-17 11:20:17 +0200 |
| commit | 0b40c1d08a107ddb0637a2793d3f044d4dfefa88 (patch) | |
| tree | 34441fde8776d90c6e8bccae98828de863b9601c /apps/files_encryption/lib/util.php | |
| parent | ca6a77d39b738aeead0bbbfdfdf2a06382431f6f (diff) | |
| parent | d7dc710c8b1d46947cb2afe13152e0adc9ee5594 (diff) | |
| download | nextcloud-server-0b40c1d08a107ddb0637a2793d3f044d4dfefa88.tar.gz nextcloud-server-0b40c1d08a107ddb0637a2793d3f044d4dfefa88.zip | |
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Diffstat (limited to 'apps/files_encryption/lib/util.php')
| -rw-r--r-- | apps/files_encryption/lib/util.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php index 5a6583465e0..b312b502c14 100644 --- a/apps/files_encryption/lib/util.php +++ b/apps/files_encryption/lib/util.php @@ -1328,7 +1328,7 @@ class Util { foreach ($dirContent as $item) { $filePath = substr($item['path'], 25); if ($item['type'] == 'dir') { - $this->addRecoveryKey($filePath.'/'); + $this->addRecoveryKeys($filePath.'/'); } else { $session = new Session(new \OC_FilesystemView('/')); $sharingEnabled = \OCP\Share::isEnabled(); @@ -1409,7 +1409,7 @@ class Util { foreach ($dirContent as $item) { $filePath = substr($item['path'], 25); if ($item['type'] == 'dir') { - $this->addRecoveryKey($filePath . '/', $privateKey); + $this->recoverAllFiles($filePath . '/', $privateKey); } else { $file = substr($filePath, 0, -4); $this->recoverFile($file, $privateKey); |