fix twitter title showing up occasionally

diff --git a/include/items.php b/include/items.php
index f4837449d72ff7a61b97b7d024e954f2066ec3c7..f87a92334c1776f22aa67f92853406e494c2be43 100755 (executable)
--- 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 b9813cfa9fa983c6a38c738f8c4e01f3d25d6b11..b2c7862ce1dd2adbaf9a0923231c935ff9adc955 100755 (executable)
--- 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'),