From: friendica <info@friendica.com>
Date: Fri, 15 Jun 2012 00:27:07 +0000 (-0700)
Subject: poll even if contact hasn't responded recently, so we can update the termination... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=267681844d81364afce37c86f92b803c3d8e4c48;p=friendica.git

poll even if contact hasn't responded recently, so we can update the termination status
---

diff --git a/include/conversation.php b/include/conversation.php
index 68693bb9fc..1d5a92284a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -173,8 +173,8 @@ function localize_item(&$item){
 				$item['body'] = str_replace($mtch[0],'@[url=' . zrl($mtch[1]). ']',$item['body']);
 		}
 	}
+	// add zrl's to public images
 	if(preg_match_all('/\[url=(.*?)\/photos\/(.*?)\/image\/(.*?)\]\[img(.*?)\]h(.*?)\[\/img\]\[\/url\]/is',$item['body'],$matches,PREG_SET_ORDER)) {
-logger('matched');
 		foreach($matches as $mtch) {
 				$item['body'] = str_replace($mtch[0],'[url=' . zrl($mtch[1] . '/photos/' . $mtch[2] . '/image/' . $mtch[3] ,true) . '][img' . $mtch[4] . ']h' . $mtch[5]  . '[/img][/url]',$item['body']);
 		}
diff --git a/include/onepoll.php b/include/onepoll.php
index 447881ab71..804a166c80 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -54,9 +54,7 @@ function onepoll_run($argv, $argc){
 		logger('onepoll: no contact');
 		return;
 	}
-
-	if(was_recently_delayed($contact_id))
-		return;
+	
 
 	$d = datetime_convert();
 
@@ -87,7 +85,7 @@ function onepoll_run($argv, $argc){
 	}
 
 	$contact = $contacts[0];
-
+	logger('onepoll: ' . $contact['id'] . ' ' . $contact['name'], LOGGER_DEBUG);
 
 	$xml = false;