diff options
| author | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-08 09:05:38 +0200 |
| commit | 78429926bcf1ab7e8a4d35d0093ba666b3568708 (patch) | |
| tree | f9f1d219ecbbaa52982e1f26b842e1e824b68c85 /include/delivery.php | |
| parent | a2ea560bf397902ce5608daabf101d0bcf813f13 (diff) | |
| parent | df3574663944f50820e2d50cfb9d87f505ceff54 (diff) | |
| download | volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.gz volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.tar.bz2 volse-hubzilla-78429926bcf1ab7e8a4d35d0093ba666b3568708.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/delivery.php')
| -rw-r--r-- | include/delivery.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/delivery.php b/include/delivery.php index 28d81226a..5f84a548a 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -347,7 +347,10 @@ function delivery_run($argv, $argc){ } } - $deliver_status = dfrn_deliver($owner,$contact,$atom); + if(! was_recently_delayed($contact['id'])) + $deliver_status = dfrn_deliver($owner,$contact,$atom); + else + $deliver_status = (-1); logger('notifier: dfrn_delivery returns ' . $deliver_status); @@ -390,7 +393,11 @@ function delivery_run($argv, $argc){ logger('notifier: slapdelivery: ' . $contact['name']); foreach($slaps as $slappy) { if($contact['notify']) { - $deliver_status = slapper($owner,$contact['notify'],$slappy); + if(! was_recently_delayed($contact['id'])) + $deliver_status = slapper($owner,$contact['notify'],$slappy); + else + $deliver_status = (-1); + if($deliver_status == (-1)) { // queue message for redelivery add_to_queue($contact['id'],NETWORK_OSTATUS,$slappy); |