From 11871195be019bb05c7c41dbb4a980fffce41697 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 20 Feb 2012 18:06:43 -0800
Subject: fix twitter title showing up occasionally

---
 include/items.php | 4 ++--
 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'),
-- 
cgit v1.2.3