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/diaspora.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/diaspora.php')
-rw-r--r-- | include/diaspora.php | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 5069c1127..2051de5fc 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2298,14 +2298,20 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) { logger('diaspora_transmit: ' . $logid . ' ' . $dest_url); - if(! intval(get_config('system','diaspora_test'))) - post_url($dest_url . '/', $slap); + if(was_recently_delayed($contact['id'])) { + $return_code = 0; + } else { - logger('diaspora_transmit: test_mode'); - return 200; + if(! intval(get_config('system','diaspora_test'))) { + post_url($dest_url . '/', $slap); + $return_code = $a->get_curl_code(); + } + else { + logger('diaspora_transmit: test_mode'); + return 200; + } } - - $return_code = $a->get_curl_code(); + logger('diaspora_transmit: ' . $logid . ' returns: ' . $return_code); if((! $return_code) || (($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))) { |