aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-06-14 17:27:07 -0700
committerfriendica <info@friendica.com>2012-06-14 17:27:07 -0700
commit267681844d81364afce37c86f92b803c3d8e4c48 (patch)
tree43037f2a5c59e16836841223b5cc2dec85510673
parentbe090cc8513504edcfaf368915e45308711f7e7c (diff)
downloadvolse-hubzilla-267681844d81364afce37c86f92b803c3d8e4c48.tar.gz
volse-hubzilla-267681844d81364afce37c86f92b803c3d8e4c48.tar.bz2
volse-hubzilla-267681844d81364afce37c86f92b803c3d8e4c48.zip
poll even if contact hasn't responded recently, so we can update the termination status
-rw-r--r--include/conversation.php2
-rw-r--r--include/onepoll.php6
2 files changed, 3 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 68693bb9f..1d5a92284 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 447881ab7..804a166c8 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;