diff options
| author | Joas Schilling <coding@schilljs.com> | 2016-08-31 12:30:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 12:30:37 +0200 |
| commit | e4311a2ebdf3eeda8b2f1022c19290dc68db8ae5 (patch) | |
| tree | 8062098678e0627687ebe63ab4cac5e8a0d2d309 /lib | |
| parent | a82d4a56fb5bc484114c702bcd63e6278830bd5d (diff) | |
| parent | 351cab6bce41b53f9efd4ba9aed4e7435f843691 (diff) | |
| download | nextcloud-server-e4311a2ebdf3eeda8b2f1022c19290dc68db8ae5.tar.gz nextcloud-server-e4311a2ebdf3eeda8b2f1022c19290dc68db8ae5.zip | |
Merge pull request #608 from nextcloud/small-encryption-improvement
skip shared files, if files get decrypted only for a specific user we…
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Encryption/DecryptAll.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Encryption/DecryptAll.php b/lib/private/Encryption/DecryptAll.php index 6e309b5c892..b84395b9e17 100644 --- a/lib/private/Encryption/DecryptAll.php +++ b/lib/private/Encryption/DecryptAll.php @@ -210,6 +210,10 @@ class DecryptAll { while ($root = array_pop($directories)) { $content = $this->rootView->getDirectoryContent($root); foreach ($content as $file) { + // only decrypt files owned by the user + if($file->getStorage()->instanceOfStorage('OC\Files\Storage\Shared')) { + continue; + } $path = $root . '/' . $file['name']; if ($this->rootView->is_dir($path)) { $directories[] = $path; |