From 3ff88c8c84d887c36a5b6587c402bd627bcffdd6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 9 Feb 2016 15:30:31 +0100 Subject: Revert "Disable the remote sharing notifications until they work properly" This reverts commit 6bc93c740194d245bb9a7d1f230ed33461f842a7. Conflicts: apps/files_sharing/lib/external/manager.php --- apps/files_sharing/lib/external/manager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/files_sharing/lib/external') 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; } -- cgit v1.2.3