summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2018-02-28 15:16:18 +0100
committerJoas Schilling <coding@schilljs.com>2018-03-06 12:15:57 +0100
commit5d8aaf9696af82a69ab36b5388f1114ccdf3a2ce (patch)
treee69cb86b008e160ab6e7bbfdc0e07526e51022a0 /apps/files
parent7c15b99a493b14fec22d6b5c311135499727dedb (diff)
downloadnextcloud-server-5d8aaf9696af82a69ab36b5388f1114ccdf3a2ce.tar.gz
nextcloud-server-5d8aaf9696af82a69ab36b5388f1114ccdf3a2ce.zip
Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/lib/Activity/Provider.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
index fb72d93c248..8c17f402fad 100644
--- a/apps/files/lib/Activity/Provider.php
+++ b/apps/files/lib/Activity/Provider.php
@@ -440,7 +440,7 @@ class Provider implements IProvider {
return $parent;
}
- return $this->getParentEndToEndEncryptionContainer($userFolder, $file);
+ return $this->getParentEndToEndEncryptionContainer($userFolder, $parent);
}
/**