don't check for was_recently_delayed in diaspora_transmit during a queue run

diff --git a/include/diaspora.php b/include/diaspora.php
index df388737a3c3efc09f98fb94d90029037f0a60e7..79b4d1a26ba30faa3bd1b07a2bb4c4bf6d42cf7d 100755 (executable)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2517,7 +2517,7 @@ function diaspora_send_mail($item,$owner,$contact) {
 
 }
 
-function diaspora_transmit($owner,$contact,$slap,$public_batch) {
+function diaspora_transmit($owner,$contact,$slap,$public_batch,$queue_run=false) {
 
        $enabled = intval(get_config('system','diaspora_enabled'));
        if(! $enabled) {
@@ -2534,7 +2534,7 @@ function diaspora_transmit($owner,$contact,$slap,$public_batch) {
 
        logger('diaspora_transmit: ' . $logid . ' ' . $dest_url);
 
-       if(was_recently_delayed($contact['id'])) {
+       if( (! $queue_run) && (was_recently_delayed($contact['id'])) ) {
                $return_code = 0;
        }
        else {

diff --git a/include/lock.php b/include/lock.php
index 5f1ca63231123a87dac5cceb165c9edf253a6583..707e33609e32456b64c7e295b8786b3f1e0964f3 100644 (file)
--- a/include/lock.php
+++ b/include/lock.php
@@ -73,5 +73,3 @@ function unlock_function($fn_name) {
 
        return;
 }}
-
-?>

diff --git a/include/queue.php b/include/queue.php
index 7e92705be27db7e639c547b8a6c2a45853aeef96..ba3babe70dd3c4538876dc691dba385edebfafc6 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -161,7 +161,7 @@ function queue_run($argv, $argc){
                        case NETWORK_DIASPORA:
                                if($contact['notify']) {
                                        logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-                                       $deliver_status = diaspora_transmit($owner,$contact,$data,$public);
+                                       $deliver_status = diaspora_transmit($owner,$contact,$data,$public,true);
 
                                        if($deliver_status == (-1))
                                                update_queue_time($q_item['id']);