X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=9dcefdd244b59288c9177a401735d186480a680b;hb=da8a48f89eae1efe34ce2bafc8cb230a9b7933be;hp=f262072e6f627aa6b653dd91b59611cdca4da5ae;hpb=cef6fce7f0e1f836f5f5e5e875c3436998389d44;p=friendica.git

diff --git a/include/queue_fn.php b/include/queue_fn.php
index f262072e6f..9dcefdd244 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -23,19 +23,26 @@ function remove_queue_item($id) {
  * @return bool The communication with this contact has currently problems
  */
 function was_recently_delayed($cid) {
+	$was_delayed = false;
 
-	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d 
-		and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
+	// Are there queue entries that were recently added?
+	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
+		AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
 		intval($cid)
 	);
-	if (dbm::is_result($r))
-		return true;
 
-	$r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
-		intval($cid)
-	);
+	$was_delayed = dbm::is_result($r);
+
+	// We set "term-date" to a current date if the communication has problems.
+	// If the communication works again we reset this value.
+	if ($was_delayed) {
+		$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
+			intval($cid)
+		);
+		$was_delayed = !dbm::is_result($r);
+	}
 
-	return (dbm::is_result($r));
+	return $was_delayed;
 }