harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comments need to have some kind of routing instructions.

Browse Source
This commit is contained in:
redmatrix 2015-05-26 21:00:27 -07:00
parent ae69bf54a6
commit 07e8fe1b1c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/notifier.php
View File

@ -412,6 +412,8 @@ function notifier_run($argv, $argc){
: false : false
); );
$uplink = false; $uplink = false;
// $cmd === 'relay' indicates the owner is sending it to the original recipients // $cmd === 'relay' indicates the owner is sending it to the original recipients
@ -428,6 +430,17 @@ function notifier_run($argv, $argc){
$uplink = true; $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')) { if(($relay_to_owner || $uplink) && ($cmd !== 'relay')) {
logger('notifier: followup relay', LOGGER_DEBUG); logger('notifier: followup relay', LOGGER_DEBUG);
$recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']); $recipients = array(($uplink) ? $parent_item['source_xchan'] : $parent_item['owner_xchan']);

2
version.inc
View File

@ -1 +1 @@
2015-05-25.1043 2015-05-26.1044