diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-12 12:10:09 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-12 12:10:09 +0530 |
| commit | 10db2f00f9f90cb7ee9fbd94a5c986427de779c2 (patch) | |
| tree | 9504ad13c592621521f7051fb06b5ca81ce1d757 /include/delivery.php | |
| parent | b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (diff) | |
| parent | 2454028ef61a3ea1dd8308896c8bbf1f04f97ac9 (diff) | |
| download | volse-hubzilla-10db2f00f9f90cb7ee9fbd94a5c986427de779c2.tar.gz volse-hubzilla-10db2f00f9f90cb7ee9fbd94a5c986427de779c2.tar.bz2 volse-hubzilla-10db2f00f9f90cb7ee9fbd94a5c986427de779c2.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
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); |