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/lib/external | |
| 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/lib/external')
| -rw-r--r-- | apps/files_sharing/lib/external/manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php index ea49348737f..0ced71aab2c 100644 --- a/apps/files_sharing/lib/external/manager.php +++ b/apps/files_sharing/lib/external/manager.php @@ -194,7 +194,7 @@ class Manager { \OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $share['remote']]); - //FIXME $this->scrapNotification($share['remote_id']); + $this->scrapNotification($share['remote_id']); return true; } @@ -217,7 +217,7 @@ class Manager { $removeShare->execute(array($id, $this->uid)); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline'); - //FIXME $this->scrapNotification($share['remote_id']); + $this->scrapNotification($share['remote_id']); return true; } |