diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-02-09 15:30:31 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-02-10 08:40:44 +0100 |
| commit | 3ff88c8c84d887c36a5b6587c402bd627bcffdd6 (patch) | |
| tree | 93f8edbb3f046ad58353eb8bf25af4d2651d0bbd /apps/files_sharing/api | |
| parent | 9ebcc4ce312db574173627488887f14db2f4bc34 (diff) | |
| download | nextcloud-server-3ff88c8c84d887c36a5b6587c402bd627bcffdd6.tar.gz nextcloud-server-3ff88c8c84d887c36a5b6587c402bd627bcffdd6.zip | |
Revert "Disable the remote sharing notifications until they work properly"
This reverts commit 6bc93c740194d245bb9a7d1f230ed33461f842a7.
Conflicts:
apps/files_sharing/lib/external/manager.php
Diffstat (limited to 'apps/files_sharing/api')
| -rw-r--r-- | apps/files_sharing/api/server2server.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php index e1195cb9573..f15169b74a2 100644 --- a/apps/files_sharing/api/server2server.php +++ b/apps/files_sharing/api/server2server.php @@ -88,8 +88,6 @@ class Server2Server { Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(), '', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW); - /** - * FIXME $urlGenerator = \OC::$server->getURLGenerator(); $notificationManager = \OC::$server->getNotificationManager(); @@ -111,7 +109,6 @@ class Server2Server { $notification->addAction($acceptAction); $notificationManager->notify($notification); - */ return new \OC_OCS_Result(); } catch (\Exception $e) { |