clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix twitter title showing up occasionally

This commit is contained in:
friendica 2012-02-20 18:06:43 -08:00
parent 4fbd93f7e7
commit 11871195be
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -1700,7 +1700,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
if(! is_array($contact))
return;
if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) {
if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) {
if(strlen($datarray['title']))
unset($datarray['title']);
$datarray['last-child'] = 1;
@ -2074,7 +2074,7 @@ function local_delivery($importer,$data) {
$datarray = get_atom_elements($feed,$item);
// TODO: make this next part work against both delivery threads of a community post
// TODO: make this next part work against both delivery threads of a community post
// if((! link_compare($datarray['author-link'],$importer['url'])) && (! $community)) {
// logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] );

4
include/text.php
View File

@ -776,13 +776,11 @@ function smilies($s, $sample = false) {
else {
$s = str_replace($params['texts'],$params['icons'],$params['string']);
}
return $s;
}}
if(! function_exists('day_translate')) {
function day_translate($s) {
$ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),