Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-08-18 13:53:51 +0300
committerGitHub <noreply@github.com>2016-08-18 13:53:51 +0300
commit45e40494a0c912f79b3d582adb97a3ed9a014f1e (patch)
treeea3150613cfdc83011e81ea4733929198db58578 /lib
parent3306473ea7250da782bdd9a2e11d9c29dee0c3c1 (diff)
parent4913b5991e057a17c308ac1d5661f1475fb32f55 (diff)
Merge pull request #25832 from owncloud/stable9-dont-decrypt-shared-files
[stable9] Don't decrypt shared files
Diffstat (limited to 'lib')
-rw-r--r--lib/private/encryption/decryptall.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
index 34a3e1bff91..376cdd3d5aa 100644
--- a/lib/private/encryption/decryptall.php
+++ b/lib/private/encryption/decryptall.php
@@ -206,6 +206,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;