diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-17 18:16:46 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-17 18:16:46 -0800 |
| commit | 1b9722c65ac2169cadcf78376aaaf9d82721c9cd (patch) | |
| tree | 63f02227d902842be89dc29387f01c8fbf2769df /include/notifier.php | |
| parent | 62a60e554235c66c88955d16134c874ad560bf72 (diff) | |
| download | volse-hubzilla-1b9722c65ac2169cadcf78376aaaf9d82721c9cd.tar.gz volse-hubzilla-1b9722c65ac2169cadcf78376aaaf9d82721c9cd.tar.bz2 volse-hubzilla-1b9722c65ac2169cadcf78376aaaf9d82721c9cd.zip | |
loop detection
Diffstat (limited to 'include/notifier.php')
| -rw-r--r-- | include/notifier.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php index 67e2472ef..50981df9d 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -378,9 +378,12 @@ function notifier_run($argv, $argc){ // if our parent is a tag_delivery recipient, uplink to the original author causing // a delivery fork. - if(intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) { - logger('notifier: uplinking this item'); - proc_run('php','include/notifier.php','uplink',$item_id); + if(($parent_item) && intval($parent_item['item_uplink']) && (! $top_level_post) && ($cmd !== 'uplink')) { + // don't uplink a relayed post to the relay owner + if($parent_item['source_xchan'] !== $parent_item['owner_xchan']) { + logger('notifier: uplinking this item'); + proc_run('php','include/notifier.php','uplink',$item_id); + } } $private = false; |