From 6dc0477c0090956528fbf1d50c7cdf91244fe143 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Sat, 16 Jan 2016 22:39:59 +0100 Subject: [PATCH] Let the remote side know the Salmon was accepted (sorta) --- plugins/OStatus/lib/salmonaction.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php index fad5d0cfe5..41e4262498 100644 --- a/plugins/OStatus/lib/salmonaction.php +++ b/plugins/OStatus/lib/salmonaction.php @@ -109,6 +109,7 @@ class SalmonAction extends Action // duplicate? Maybe someone's database is out of sync? // Let's just accept it and move on. common_log(LOG_INFO, 'Salmon slap carried an event which had already been fulfilled.'); + return true; } catch (NoticeSaveException $e) { common_debug('Notice::saveActivity did not save our '._ve($this->activity->verb).' activity, trying old-fashioned salmon saving.'); }