aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-11-28 01:41:34 -0800
committerVincent Petry <pvince81@owncloud.com>2013-11-28 01:41:34 -0800
commita1d2f0f51605b6c4b2a204e6650c683881052a1a (patch)
tree69981fc441891c43a7c75795020810625b7bd024
parentf23d641b82b0b8f2834983800b3520fcadf6bd71 (diff)
parentefe7c4075a3f207ca6156381fc84659bf14dbf00 (diff)
downloadnextcloud-server-a1d2f0f51605b6c4b2a204e6650c683881052a1a.tar.gz
nextcloud-server-a1d2f0f51605b6c4b2a204e6650c683881052a1a.zip
Merge pull request #6094 from owncloud/enc_fix_reshares
fix path reconstruction for reshares
-rw-r--r--apps/files_encryption/hooks/hooks.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 35574b8e5b9..f142f525cfa 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -318,8 +318,8 @@ class Hooks {
// get the parent from current share
$parent = $util->getShareParent($params['parent']);
- // if parent is file the it is an 1:1 share
- if ($parent['item_type'] === 'file') {
+ // if parent has the same type than the child it is a 1:1 share
+ if ($parent['item_type'] === $params['itemType']) {
// prefix path with Shared
$path = '/Shared' . $parent['file_target'];