friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
friendica 2012-06-14 17:27:07 -07:00
parent be090cc851
commit 267681844d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -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']);
}

6
include/onepoll.php
View File

@ -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;