diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-08-03 11:05:45 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-08-03 11:05:45 +0200 |
| commit | ac3d8d1e43766c1912f95cf0638548cdba1a6ab2 (patch) | |
| tree | 1ab25983df49d16a03656356e6de92f3f73819a7 | |
| parent | 04521c6afc77f095697e8196790400920756149a (diff) | |
| download | nextcloud-server-ac3d8d1e43766c1912f95cf0638548cdba1a6ab2.tar.gz nextcloud-server-ac3d8d1e43766c1912f95cf0638548cdba1a6ab2.zip | |
effectively revert 17fae47bdba84ed520fee2cbf1a9485cc14fbbcb fixing i10n
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| -rw-r--r-- | apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php index 228e481655e..4068c3c0266 100644 --- a/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php +++ b/apps/federatedfilesharing/lib/OCM/CloudFederationProviderFiles.php @@ -257,7 +257,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { ->setAffectedUser($shareWith) ->setObject('remote_share', (int)$shareId, $name); \OC::$server->getActivityManager()->publish($event); - $this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner); + $this->notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name); } else { $groupMembers = $this->groupManager->get($shareWith)->getUsers(); foreach ($groupMembers as $user) { @@ -268,7 +268,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { ->setAffectedUser($user->getUID()) ->setObject('remote_share', (int)$shareId, $name); \OC::$server->getActivityManager()->publish($event); - $this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner); + $this->notifyAboutNewShare($user->getUID(), $shareId, $ownerFederatedId, $sharedByFederatedId, $name); } } return $shareId; @@ -334,22 +334,13 @@ class CloudFederationProviderFiles implements ICloudFederationProvider { return $result; } - /** - * notify user about new federated share - * - * @param $shareWith - * @param $shareId - * @param $ownerFederatedId - * @param $sharedByFederatedId - * @param $name - */ - private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name, $sharedBy, $owner) { + private function notifyAboutNewShare($shareWith, $shareId, $ownerFederatedId, $sharedByFederatedId, $name): void { $notification = $this->notificationManager->createNotification(); $notification->setApp('files_sharing') ->setUser($shareWith) ->setDateTime(new \DateTime()) ->setObject('remote_share', $shareId) - ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/'), $sharedBy, $owner]); + ->setSubject('remote_share', [$ownerFederatedId, $sharedByFederatedId, trim($name, '/')]); $declineAction = $notification->createAction(); $declineAction->setLabel('decline') |