From 07e8fe1b1cbd3a9fbddb95b85c1b372de7fb6e85 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 26 May 2015 21:00:27 -0700 Subject: Comments need to have some kind of routing instructions. --- include/notifier.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include/notifier.php') diff --git a/include/notifier.php b/include/notifier.php index b82fb41cc..c89c756d9 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -412,6 +412,8 @@ function notifier_run($argv, $argc){ : false ); + + $uplink = false; // $cmd === 'relay' indicates the owner is sending it to the original recipients @@ -428,6 +430,17 @@ function notifier_run($argv, $argc){ $uplink = true; } + + if((! $top_level_post) && (! $relay_to_owner) && (! $uplink) && ($cmd !== 'relay')) { + + // We've been asked to deliver a comment, but it isn't being sent upstream + // and the owner isn't delivering it downstream. This is totally unexpected + // and shouldn't happen. We will also not allow it to happen. + + logger('Comment being processed with unspecific routing.'); + return; + } + if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) { logger('notifier: followup relay', LOGGER_DEBUG); $recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']); -- cgit v1.2.3