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/diaspora.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/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')))) { |