summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/lib/Activity/Providers
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-07-10 12:10:36 +0200
committerJoas Schilling <coding@schilljs.com>2017-07-10 12:10:36 +0200
commitb69ddfba8be6938d85f4932cf9691f955105c4c5 (patch)
tree00d7b269b11d7d27f24cb41c2f64222d38e35758 /apps/files_sharing/lib/Activity/Providers
parentc7b28064e3c8335312a644b94ced602a9f0fea0f (diff)
downloadnextcloud-server-b69ddfba8be6938d85f4932cf9691f955105c4c5.tar.gz
nextcloud-server-b69ddfba8be6938d85f4932cf9691f955105c4c5.zip
Fix activity emails for accept/decline of remote shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'apps/files_sharing/lib/Activity/Providers')
-rw-r--r--apps/files_sharing/lib/Activity/Providers/RemoteShares.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php
index 6ac0be76ff4..cf4954800e8 100644
--- a/apps/files_sharing/lib/Activity/Providers/RemoteShares.php
+++ b/apps/files_sharing/lib/Activity/Providers/RemoteShares.php
@@ -131,8 +131,12 @@ class RemoteShares extends Base {
];
case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
case self::SUBJECT_REMOTE_SHARE_DECLINED:
+ $fileParameter = $parameters[1];
+ if (!is_array($fileParameter)) {
+ $fileParameter = [$event->getObjectId() => $event->getObjectName()];
+ }
return [
- 'file' => $this->getFile([$event->getObjectId() => $event->getObjectName()]),
+ 'file' => $this->getFile($fileParameter),
'user' => $this->getFederatedUser($parameters[0]),
];
}