diff options
| author | friendica <info@friendica.com> | 2012-02-20 18:06:43 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-02-20 18:06:43 -0800 |
| commit | 11871195be019bb05c7c41dbb4a980fffce41697 (patch) | |
| tree | 08cd47c359d9f19ff0fa9461f923e88d79e7d038 | |
| parent | 4fbd93f7e7237530cf291ca473591dea1f680270 (diff) | |
| download | volse-hubzilla-11871195be019bb05c7c41dbb4a980fffce41697.tar.gz volse-hubzilla-11871195be019bb05c7c41dbb4a980fffce41697.tar.bz2 volse-hubzilla-11871195be019bb05c7c41dbb4a980fffce41697.zip | |
fix twitter title showing up occasionally
| -rwxr-xr-x | include/items.php | 4 | ||||
| -rwxr-xr-x | include/text.php | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index f4837449d..f87a92334 100755 --- a/include/items.php +++ b/include/items.php @@ -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'] ); diff --git a/include/text.php b/include/text.php index b9813cfa9..b2c7862ce 100755 --- a/include/text.php +++ b/include/text.php @@ -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'), |