diff options
| -rw-r--r-- | include/notifier.php | 13 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 14 insertions, 1 deletions
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']); diff --git a/version.inc b/version.inc index 20fd10ffb..7d3b1b5ef 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-25.1043 +2015-05-26.1044 |