diff options
| author | friendica <info@friendica.com> | 2015-02-24 20:21:21 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-24 20:21:21 -0800 |
| commit | 1434130264836916001fe191dd237e51af5c6e3e (patch) | |
| tree | f71449fb6fc389f206a98d25fde60c6b0716f51a | |
| parent | 08f054130f5a57e2928e129131e7609271ec7f40 (diff) | |
| download | volse-hubzilla-1434130264836916001fe191dd237e51af5c6e3e.tar.gz volse-hubzilla-1434130264836916001fe191dd237e51af5c6e3e.tar.bz2 volse-hubzilla-1434130264836916001fe191dd237e51af5c6e3e.zip | |
don't send deleted items upstream - only downstream.
| -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 fe6ac33c0..c77857087 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -315,9 +315,12 @@ function notifier_run($argv, $argc){ $r = fetch_post_tags($r); $target_item = $r[0]; + $deleted_item = false; - if($target_item['item_restrict'] & ITEM_DELETED) + if($target_item['item_restrict'] & ITEM_DELETED) { logger('notifier: target item ITEM_DELETED', LOGGER_DEBUG); + $deleted_item = true; + } $unforwardable = ITEM_UNPUBLISHED|ITEM_DELAYED_PUBLISH|ITEM_WEBPAGE|ITEM_BUILDBLOCK|ITEM_PDL; if($target_item['item_restrict'] & $unforwardable) { @@ -376,7 +379,7 @@ function notifier_run($argv, $argc){ // tag_deliver'd post which needs to be sent back to the original author - if(($cmd === 'uplink') && ($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post)) { + if(($cmd === 'uplink') && ($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && (! $deleted_item)) { logger('notifier: uplink'); $uplink = true; } @@ -397,7 +400,7 @@ function notifier_run($argv, $argc){ // if our parent is a tag_delivery recipient, uplink to the original author causing // a delivery fork. - if(($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && ($cmd !== 'uplink')) { + if(($parent_item['item_flags'] & ITEM_UPLINK) && (! $top_level_post) && ($cmd !== 'uplink') && (! $deleted_item)) { logger('notifier: uplinking this item'); proc_run('php','include/notifier.php','uplink',$item_id); } |