From 00eb000e36489fc0e1bd9d27dcee916f157e39a0 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Mon, 9 Jul 2012 09:39:09 -0600
Subject: [PATCH] don't check for was_recently_delayed in diaspora_transmit
 during a queue run

---
 include/diaspora.php | 4 ++--
 include/lock.php     | 2 --
 include/queue.php    | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index df388737a3..79b4d1a26b 100755
--- 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 5f1ca63231..707e33609e 100644
--- 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 7e92705be2..ba3babe70d 100644
--- 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']);