summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-10-20 20:44:05 +0200
committerGitHub <noreply@github.com>2016-10-20 20:44:05 +0200
commitd9aeee2aa1f2d47c950a4e053a47b38a040b62b5 (patch)
tree7b98aebc73eef78cddaaa7234ef0e55691c64509 /lib
parentc7ba73e6f48b3a69b4f692c739b8c53e18735235 (diff)
parentd4976e55544ddab17713e2f3aa4f5f5f5eb9986f (diff)
downloadnextcloud-server-d9aeee2aa1f2d47c950a4e053a47b38a040b62b5.tar.gz
nextcloud-server-d9aeee2aa1f2d47c950a4e053a47b38a040b62b5.zip
Merge pull request #1826 from nextcloud/downstream-26391
Fix post_unshareFromSelf hook parameter format
Diffstat (limited to 'lib')
-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;
}