summaryrefslogtreecommitdiffstats
path: root/lib/private/Share
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-10-13 10:53:04 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-10-20 16:09:08 +0200
commitd4976e55544ddab17713e2f3aa4f5f5f5eb9986f (patch)
tree66c28164ef9b97524bccb56064de779be7a37e22 /lib/private/Share
parent5d7e9bb8fcbcd9a03cf0723c5258b41487850f7d (diff)
downloadnextcloud-server-d4976e55544ddab17713e2f3aa4f5f5f5eb9986f.tar.gz
nextcloud-server-d4976e55544ddab17713e2f3aa4f5f5f5eb9986f.zip
Fix post_unshareFromSelf hook parameter format
When unsharing from self in a group share situation, the share items passed to the post_unshareFromSelf hook were using the wrong format in which the attribute names (ex: "share_type") have non camel-case format. This fix makes sure that in group sharing case we use the correct format. It looks like the code was already producing it but in array_merge it was not using it and adding the unprocessed one.
Diffstat (limited to 'lib/private/Share')
-rw-r--r--lib/private/Share/Share.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 9210dfd1fd1..33801cd6347 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -1059,7 +1059,7 @@ class Share extends Constants {
if (isset($groupShare['file_target'])) {
$shareTmp['fileTarget'] = $groupShare['file_target'];
}
- $listOfUnsharedItems = array_merge($listOfUnsharedItems, array($groupShare));
+ $listOfUnsharedItems = array_merge($listOfUnsharedItems, [$shareTmp]);
$itemUnshared = true;
} elseif (!$itemUnshared && isset($uniqueGroupShare)) {
$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
@@ -1074,7 +1074,7 @@ class Share extends Constants {
if (isset($uniqueGroupShare['file_target'])) {
$shareTmp['fileTarget'] = $uniqueGroupShare['file_target'];
}
- $listOfUnsharedItems = array_merge($listOfUnsharedItems, array($uniqueGroupShare));
+ $listOfUnsharedItems = array_merge($listOfUnsharedItems, [$shareTmp]);
$itemUnshared = true;
}