Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 05:42:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix twitter title showing up occasionally

Browse source
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)) if(! is_array($contact))
return; return;
if($contact['network'] === NETWORK_OSTATUS || stristr($permalink,'twitter.com')) { if($contact['network'] === NETWORK_OSTATUS || stristr($contact['url'],'twitter.com')) {
if(strlen($datarray['title'])) if(strlen($datarray['title']))
unset($datarray['title']); unset($datarray['title']);
$datarray['last-child'] = 1; $datarray['last-child'] = 1;
@ -2074,7 +2074,7 @@ function local_delivery($importer,$data) {
$datarray = get_atom_elements($feed,$item); $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)) { // 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'] ); // logger('local_delivery: received relay claiming to be from ' . $importer['url'] . ' however comment author url is ' . $datarray['author-link'] );

2
include/text.php
View file

@ -781,8 +781,6 @@ function smilies($s, $sample = false) {
}} }}
if(! function_exists('day_translate')) { if(! function_exists('day_translate')) {
function day_translate($s) { function day_translate($s) {
$ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'), $ret = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),